diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt
index 4e0b5b70..df8cd411 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt
@@ -18,10 +18,6 @@ package im.vector.riotx.features.home
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.riotx.core.utils.RxStore
-import im.vector.riotx.features.home.room.list.RoomListDisplayModeFilter
-import im.vector.riotx.features.home.room.list.RoomListFragment
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt
index e9dd9813..7bb5c305 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt
@@ -18,8 +18,9 @@ package im.vector.riotx.features.home.room.list
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import io.reactivex.functions.Predicate
+import javax.inject.Inject
 
-class RoomListNameFilter : Predicate<RoomSummary> {
+class RoomListNameFilter @Inject constructor() : Predicate<RoomSummary> {
 
     var filter: String = ""
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
index c439ea20..03bedbc7 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
@@ -26,13 +26,12 @@ import im.vector.riotx.features.home.room.filtered.filteredRoomFooterItem
 import javax.inject.Inject
 
 class RoomSummaryController @Inject constructor(private val stringProvider: StringProvider,
-                                                private val roomSummaryItemFactory: RoomSummaryItemFactory
+                                                private val roomSummaryItemFactory: RoomSummaryItemFactory,
+                                                private val roomListNameFilter: RoomListNameFilter
 ) : TypedEpoxyController<RoomListViewState>() {
 
     var listener: Listener? = null
 
-    private val roomListNameFilter = RoomListNameFilter()
-
     override fun buildModels(viewState: RoomListViewState) {
         if (viewState.displayMode == RoomListFragment.DisplayMode.FILTERED) {
             buildFilteredRooms(viewState)