diff --git a/features/roomdirectory/impl/build.gradle.kts b/features/roomdirectory/impl/build.gradle.kts
index d26a75ca8c..85bb195da3 100644
--- a/features/roomdirectory/impl/build.gradle.kts
+++ b/features/roomdirectory/impl/build.gradle.kts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("io.element.android-compose-library")
     alias(libs.plugins.anvil)
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt
index 95cfa8166b..5d4cef55cb 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt
@@ -67,10 +67,10 @@ class RoomDirectoryPresenter @Inject constructor(
         }
         LaunchedEffect(searchQuery) {
             if (searchQuery == null) return@LaunchedEffect
-            // debounce search query
-            delay(300)
             // cancel load more right away
             loadingMore = false
+            // debounce search query
+            delay(300)
             roomDirectoryList.filter(searchQuery, 20)
         }
         LaunchedEffect(loadingMore) {
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index 7140a89064..3a52e63b52 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -92,7 +92,7 @@ enum class FeatureFlags(
     RoomDirectorySearch(
         key = "feature.roomdirectorysearch",
         title = "Room directory search",
-        description = "Allow user to search for public rooms in his homeserver",
+        description = "Allow user to search for public rooms in their homeserver",
         defaultValue = true,
         isFinished = false,
     )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
index dddd556bbe..78d6cb0c94 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
@@ -26,7 +26,7 @@ data class RoomDescription(
     val avatarUrl: String?,
     val joinRule: JoinRule,
     val isWorldReadable: Boolean,
-    val joinedMembers: Long
+    val numberOfMembers: Long
 ) {
     enum class JoinRule {
         PUBLIC,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
index 91b84e48c0..876a58d3a5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
@@ -35,7 +35,7 @@ class RoomDescriptionMapper {
                 null -> RoomDescription.JoinRule.UNKNOWN
             },
             isWorldReadable = roomDescription.isWorldReadable,
-            joinedMembers = roomDescription.joinedMembers.toLong(),
+            numberOfMembers = roomDescription.joinedMembers.toLong(),
         )
     }
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
index 3e53a0c2e3..6e96ca4452 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
@@ -37,5 +37,5 @@ fun aRoomDescription(
     avatarUrl = avatarUrl,
     joinRule = joinRule,
     isWorldReadable = isWorldReadable,
-    joinedMembers = joinedMembers
+    numberOfMembers = joinedMembers
 )