diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
index 5676bb0054..e9e70a84c6 100644
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitCallbackQuery.kt
@@ -47,56 +47,56 @@ private suspend inline fun <reified T : CallbackQuery> BehaviourContext.waitEven
 
 
 suspend fun BehaviourContext.waitDataCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<DataCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitGameShortNameCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<GameShortNameCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitInlineMessageIdCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<InlineMessageIdCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitInlineMessageIdDataCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<InlineMessageIdDataCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitInlineMessageIdGameShortNameCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<InlineMessageIdGameShortNameCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitMessageCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<MessageCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitMessageDataCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<MessageDataCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitMessageGameShortNameCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<MessageGameShortNameCallbackQuery>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitUnknownCallbackQuery(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: CallbackQueryMapper<UnknownCallbackQueryType>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
index 5432251eb3..d78868e2bc 100644
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
@@ -60,137 +60,137 @@ private suspend inline fun <reified T : MessageContent> BehaviourContext.waitCon
 }
 
 suspend fun BehaviourContext.waitContact(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<ContactContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitDice(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<DiceContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitGame(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<GameContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitLocation(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<LocationContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitPoll(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<PollContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitText(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<TextContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitVenue(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<VenueContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitAudioMediaGroup(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<AudioMediaGroupContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitDocumentMediaGroup(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<DocumentMediaGroupContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitMedia(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<MediaContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitMediaGroup(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<MediaGroupContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitVisualMediaGroup(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<VisualMediaGroupContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitAnimation(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<AnimationContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitAudio(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<AudioContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitDocument(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<DocumentContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitPhoto(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<PhotoContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitSticker(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<StickerContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitVideo(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     includeMediaGroups: Boolean = true,
     filter: ContentMessageToContentMapper<VideoContent>? = null
 ) = waitContent(count, initRequest, includeMediaGroups, errorFactory, filter)
 suspend fun BehaviourContext.waitVideoNote(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<VideoNoteContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitVoice(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<VoiceContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
 suspend fun BehaviourContext.waitInvoice(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: ContentMessageToContentMapper<InvoiceContent>? = null
 ) = waitContent(count, initRequest, false, errorFactory, filter)
diff --git a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
index e9ee547eb7..0093fa5111 100644
--- a/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
+++ b/tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt
@@ -14,9 +14,9 @@ import kotlinx.coroutines.flow.toList
 typealias EventMessageToEventMapper<T> = suspend ChatEventMessage<T>.() -> T?
 
 private suspend fun <O> BehaviourContext.waitEventMessages(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     mapper: suspend ChatEventMessage<ChatEvent>.() -> O?
 ): List<O> = expectFlow(
     initRequest,
@@ -33,9 +33,9 @@ private suspend inline fun <reified T : ChatEvent> BehaviourContext.waitEvents(
     noinline errorFactory: NullableRequestBuilder<*> = { null },
     noinline filter: EventMessageToEventMapper<T>? = null
 ) : List<T> = waitEventMessages<T>(
-    count,
     initRequest,
-    errorFactory
+    errorFactory,
+    count
 ) {
     if (chatEvent is T) {
         @Suppress("UNCHECKED_CAST")
@@ -51,94 +51,94 @@ private suspend inline fun <reified T : ChatEvent> BehaviourContext.waitEvents(
 }
 
 suspend fun BehaviourContext.waitChannelEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<ChannelEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 
 suspend fun BehaviourContext.waitChatEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<ChatEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitCommonEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<CommonEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitGroupEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<GroupEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitSupergroupEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<SupergroupEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 
 suspend fun BehaviourContext.waitChannelChatCreatedEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<ChannelChatCreated>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitDeleteChatPhotoEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<DeleteChatPhoto>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitGroupChatCreatedEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<GroupChatCreated>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitLeftChatMemberEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<LeftChatMember>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitNewChatPhotoEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<NewChatPhoto>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitNewChatMembersEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<NewChatMembers>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitNewChatTitleEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<NewChatTitle>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitPinnedMessageEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<PinnedMessage>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitProximityAlertTriggeredEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<ProximityAlertTriggered>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
 suspend fun BehaviourContext.waitSupergroupChatCreatedEvents(
-    count: Int = 1,
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
     filter: EventMessageToEventMapper<SupergroupChatCreated>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)