diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 07b96be..4768317 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -119,6 +119,7 @@
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="RIGHT_MARGIN" value="120" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
       <option name="WRAP_ON_TYPING" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/app/src/androidTest/java/com/zsoltbertalan/flickslate/MockSearchRepositoryModule.kt b/app/src/androidTest/java/com/zsoltbertalan/flickslate/MockSearchRepositoryModule.kt
index c88b5fb..ab991a7 100644
--- a/app/src/androidTest/java/com/zsoltbertalan/flickslate/MockSearchRepositoryModule.kt
+++ b/app/src/androidTest/java/com/zsoltbertalan/flickslate/MockSearchRepositoryModule.kt
@@ -4,6 +4,7 @@ import com.github.michaelbull.result.Ok
 import com.zsoltbertalan.flickslate.search.domain.api.GenreRepository
 import com.zsoltbertalan.flickslate.search.domain.api.SearchRepository
 import com.zsoltbertalan.flickslate.search.repository.SearchRepositoryModule
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
 import com.zsoltbertalan.flickslate.shared.testhelper.GenreMother
 import dagger.Module
 import dagger.Provides
@@ -22,7 +23,7 @@ class MockSearchRepositoryModule {
 	@Singleton
 	fun provideGenreRepository(): GenreRepository {
 		return mockk {
-			coEvery { getGenresList() } returns flowOf(Ok(GenreMother.createGenreList()))
+			coEvery { getGenresList() } returns flowOf(Ok(GenresReply( GenreMother.createGenreList())))
 		}
 	}
 
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/movies/data/network/model/MovieDetailsDto.kt b/app/src/main/java/com/zsoltbertalan/flickslate/movies/data/network/model/MovieDetailsDto.kt
index 754ff6f..11ced23 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/movies/data/network/model/MovieDetailsDto.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/movies/data/network/model/MovieDetailsDto.kt
@@ -2,7 +2,7 @@ package com.zsoltbertalan.flickslate.movies.data.network.model
 
 import com.zsoltbertalan.flickslate.movies.domain.model.MovieDetail
 import com.zsoltbertalan.flickslate.search.data.network.model.GenreDto
-import com.zsoltbertalan.flickslate.search.data.network.model.toGenreList
+import com.zsoltbertalan.flickslate.search.data.network.model.toGenresReply
 import kotlinx.serialization.Serializable
 
 @Suppress("PropertyName", "ConstructorParameterNaming")
@@ -31,5 +31,5 @@ fun MovieDetailsDto.toMovieDetail() = MovieDetail(
 	this.vote_average,
 	this.poster_path,
 	this.backdrop_path,
-	this.genres.toGenreList(),
+	this.genres.toGenresReply(),
 )
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/SearchDataModule.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/SearchDataModule.kt
new file mode 100644
index 0000000..ff0aab2
--- /dev/null
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/SearchDataModule.kt
@@ -0,0 +1,32 @@
+package com.zsoltbertalan.flickslate.search.data
+
+import com.zsoltbertalan.flickslate.search.data.api.GenreDataSource
+import com.zsoltbertalan.flickslate.search.data.api.GenreMoviesDataSource
+import com.zsoltbertalan.flickslate.search.data.db.GenreDao
+import com.zsoltbertalan.flickslate.search.data.db.GenreMoviesDao
+import com.zsoltbertalan.flickslate.search.data.network.GenreMoviesRemoteDataSource
+import com.zsoltbertalan.flickslate.search.data.network.GenreRemoteDataSource
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface SearchDataModule {
+
+	@Binds
+	fun bindGenreDataSource(genreDao: GenreDao): GenreDataSource.Local
+
+	@Binds
+	fun bindGenreRemoteDataSource(genreRemoteDataSource: GenreRemoteDataSource): GenreDataSource.Remote
+
+	@Binds
+	fun bindGenreMoviesDataSource(genreMoviesDao: GenreMoviesDao): GenreMoviesDataSource.Local
+
+	@Binds
+	fun bindGenreMoviesRemoteDataSource(
+		genreMoviesRemoteDataSource: GenreMoviesRemoteDataSource
+	): GenreMoviesDataSource.Remote
+
+}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/api/GenreDataSource.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/api/GenreDataSource.kt
new file mode 100644
index 0000000..e003234
--- /dev/null
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/api/GenreDataSource.kt
@@ -0,0 +1,32 @@
+package com.zsoltbertalan.flickslate.search.data.api
+
+import com.zsoltbertalan.flickslate.shared.domain.model.Genre
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
+import com.zsoltbertalan.flickslate.shared.util.Outcome
+import kotlinx.coroutines.flow.Flow
+
+interface GenreDataSource {
+
+	interface Local {
+
+		suspend fun purgeDatabase()
+
+		suspend fun insertGenres(genres: List<Genre>)
+
+		suspend fun insertEtag(etag: String)
+
+		suspend fun getEtag(): String
+
+		fun getGenres(): Flow<GenresReply>
+
+		fun getGenre(id: String): Genre
+
+	}
+
+	interface Remote {
+
+		suspend fun getGenres(etag: String): Outcome<GenresReply>
+
+	}
+
+}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/api/GenreMoviesDataSource.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/api/GenreMoviesDataSource.kt
new file mode 100644
index 0000000..1613264
--- /dev/null
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/api/GenreMoviesDataSource.kt
@@ -0,0 +1,29 @@
+package com.zsoltbertalan.flickslate.search.data.api
+
+import com.zsoltbertalan.flickslate.movies.domain.model.Movie
+import com.zsoltbertalan.flickslate.shared.domain.model.PageData
+import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
+import com.zsoltbertalan.flickslate.shared.util.Outcome
+import kotlinx.coroutines.flow.Flow
+
+interface GenreMoviesDataSource {
+
+	interface Local {
+
+		suspend fun purgeDatabase()
+
+		suspend fun insertGenreMovies(movies: List<Movie>, page: Int)
+
+		suspend fun insertGenreMoviesPageData(page: PageData)
+
+		fun getGenreMovies(page: Int): Flow<PagingReply<Movie>?>
+
+	}
+
+	interface Remote {
+
+		suspend fun getGenreMovies(genreId: Int, page: Int?): Outcome<PagingReply<Movie>>
+
+	}
+
+}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDao.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDao.kt
index bdb5e50..1728f46 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDao.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDao.kt
@@ -1,11 +1,13 @@
 package com.zsoltbertalan.flickslate.search.data.db
 
+import com.zsoltbertalan.flickslate.search.data.api.GenreDataSource
 import com.zsoltbertalan.flickslate.shared.async.IoDispatcher
 import com.zsoltbertalan.flickslate.shared.domain.model.Genre
 import com.zsoltbertalan.flickslate.search.data.db.model.EtagDbo
 import com.zsoltbertalan.flickslate.search.data.db.model.GenreDbo
 import com.zsoltbertalan.flickslate.search.data.db.model.toDbo
 import com.zsoltbertalan.flickslate.search.data.db.model.toGenre
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
 import io.realm.kotlin.Realm
 import io.realm.kotlin.UpdatePolicy
 import io.realm.kotlin.ext.query
@@ -21,7 +23,7 @@ import javax.inject.Singleton
 class GenreDao @Inject constructor(
 	private val realm: Realm,
 	@IoDispatcher private val ioContext: CoroutineDispatcher,
-) : GenreDataSource {
+) : GenreDataSource.Local {
 
 	override suspend fun purgeDatabase() {
 		realm.write {
@@ -42,13 +44,17 @@ class GenreDao @Inject constructor(
 		}
 	}
 
-	override suspend fun getEtag(): String = withContext(ioContext){
+	override suspend fun getEtag(): String = withContext(ioContext) {
 		return@withContext realm.query<EtagDbo>("id = $0", "genres").first().find()?.etag ?: ""
 	}
 
-	override fun getGenres(): Flow<List<Genre>> {
-		return realm.query(GenreDbo::class).asFlow().map { dbo -> dbo.list.map { it.toGenre() } }.flowOn(ioContext)
-	}
+	override fun getGenres(): Flow<GenresReply> =
+		realm.query(GenreDbo::class)
+			.asFlow()
+			.map { dbo ->
+				val etag = getEtag()
+				GenresReply(dbo.list.map { it.toGenre() }, etag)
+			}.flowOn(ioContext)
 
 	override fun getGenre(id: String): Genre {
 		return realm.query<GenreDbo>("id = $0", id).first().find()?.toGenre() ?: Genre()
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDataSource.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDataSource.kt
deleted file mode 100644
index 0b52d18..0000000
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreDataSource.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zsoltbertalan.flickslate.search.data.db
-
-import com.zsoltbertalan.flickslate.shared.domain.model.Genre
-import kotlinx.coroutines.flow.Flow
-
-interface GenreDataSource {
-
-	suspend fun purgeDatabase()
-
-	suspend fun insertGenres(genres: List<Genre>)
-
-	suspend fun insertEtag(etag: String)
-
-	suspend fun getEtag(): String
-
-	fun getGenres(): Flow<List<Genre>>
-
-	fun getGenre(id: String): Genre
-
-}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDao.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDao.kt
index a54600c..e18cae6 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDao.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDao.kt
@@ -3,6 +3,7 @@ package com.zsoltbertalan.flickslate.search.data.db
 import com.zsoltbertalan.flickslate.shared.async.IoDispatcher
 import com.zsoltbertalan.flickslate.shared.util.runCatchingUnit
 import com.zsoltbertalan.flickslate.movies.domain.model.Movie
+import com.zsoltbertalan.flickslate.search.data.api.GenreMoviesDataSource
 import com.zsoltbertalan.flickslate.shared.domain.model.PageData
 import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
 import com.zsoltbertalan.flickslate.search.data.db.model.GenreMovieDbo
@@ -24,7 +25,7 @@ import javax.inject.Singleton
 class GenreMoviesDao @Inject constructor(
 	private val realm: Realm,
 	@IoDispatcher private val ioContext: CoroutineDispatcher,
-) : GenreMoviesDataSource {
+) : GenreMoviesDataSource.Local {
 
 	override suspend fun purgeDatabase() {
 		realm.write {
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDataSource.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDataSource.kt
deleted file mode 100644
index 78f44d0..0000000
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/GenreMoviesDataSource.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zsoltbertalan.flickslate.search.data.db
-
-import com.zsoltbertalan.flickslate.movies.domain.model.Movie
-import com.zsoltbertalan.flickslate.shared.domain.model.PageData
-import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
-import kotlinx.coroutines.flow.Flow
-
-interface GenreMoviesDataSource {
-
-	suspend fun purgeDatabase()
-
-	suspend fun insertGenreMovies(movies: List<Movie>, page: Int)
-
-	suspend fun insertGenreMoviesPageData(page: PageData)
-
-	fun getGenreMovies(page: Int): Flow<PagingReply<Movie>?>
-
-}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/SearchDatabaseModule.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/SearchDatabaseModule.kt
deleted file mode 100644
index ba58f0e..0000000
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/db/SearchDatabaseModule.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zsoltbertalan.flickslate.search.data.db
-
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-interface SearchDatabaseModule {
-
-	@Binds
-	fun bindGenreDataSource(genreDao: GenreDao): GenreDataSource
-
-	@Binds
-	fun bindGenreMoviesDataSource(genreMoviesDao: GenreMoviesDao): GenreMoviesDataSource
-
-}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/GenreMoviesRemoteDataSource.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/GenreMoviesRemoteDataSource.kt
new file mode 100644
index 0000000..6a3b527
--- /dev/null
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/GenreMoviesRemoteDataSource.kt
@@ -0,0 +1,27 @@
+package com.zsoltbertalan.flickslate.search.data.network
+
+import com.zsoltbertalan.flickslate.movies.data.network.model.MoviesReplyDto
+import com.zsoltbertalan.flickslate.movies.data.network.model.toMoviesReply
+import com.zsoltbertalan.flickslate.movies.domain.model.Movie
+import com.zsoltbertalan.flickslate.search.data.api.GenreMoviesDataSource
+import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
+import com.zsoltbertalan.flickslate.shared.util.Outcome
+import com.zsoltbertalan.flickslate.shared.util.safeCallWithMetadata
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GenreMoviesRemoteDataSource @Inject constructor(
+	private val searchService: SearchService
+) : GenreMoviesDataSource.Remote {
+
+	override suspend fun getGenreMovies(genreId: Int, page: Int?): Outcome<PagingReply<Movie>> {
+		return safeCallWithMetadata(
+			{ searchService.getGenreMovie(withGenres = genreId, page = page) },
+			Response<MoviesReplyDto>::toMoviesReply
+		)
+	}
+
+}
+
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/GenreRemoteDataSource.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/GenreRemoteDataSource.kt
new file mode 100644
index 0000000..da18dfe
--- /dev/null
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/GenreRemoteDataSource.kt
@@ -0,0 +1,26 @@
+package com.zsoltbertalan.flickslate.search.data.network
+
+import com.zsoltbertalan.flickslate.search.data.api.GenreDataSource
+import com.zsoltbertalan.flickslate.search.data.network.model.GenreReplyDto
+import com.zsoltbertalan.flickslate.search.data.network.model.toGenresReply
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
+import com.zsoltbertalan.flickslate.shared.util.Outcome
+import com.zsoltbertalan.flickslate.shared.util.safeCallWithMetadata
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GenreRemoteDataSource @Inject constructor(
+	private val searchService: SearchService
+) : GenreDataSource.Remote {
+
+	override suspend fun getGenres(etag: String): Outcome<GenresReply> {
+		return safeCallWithMetadata(
+			{ searchService.getGenres(ifNoneMatch = etag) },
+			Response<GenreReplyDto>::toGenresReply
+		)
+	}
+
+}
+
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/SearchService.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/SearchService.kt
index 0f38f63..6746141 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/SearchService.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/SearchService.kt
@@ -3,7 +3,6 @@ package com.zsoltbertalan.flickslate.search.data.network
 import com.zsoltbertalan.flickslate.BuildConfig
 import com.zsoltbertalan.flickslate.movies.data.network.model.MoviesReplyDto
 import com.zsoltbertalan.flickslate.search.data.network.model.GenreReplyDto
-import com.zsoltbertalan.flickslate.tv.data.network.URL_DISCOVER_MOVIE
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -11,6 +10,7 @@ import retrofit2.http.Query
 
 const val URL_GENRE = "genre/movie/list"
 const val URL_MOVIES_SEARCH = "search/movie"
+const val URL_DISCOVER_MOVIE = "discover/movie"
 
 interface SearchService {
 
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreDto.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreDto.kt
index e1b182a..1d68ae1 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreDto.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreDto.kt
@@ -3,6 +3,7 @@ package com.zsoltbertalan.flickslate.search.data.network.model
 import com.babestudios.base.data.mapNullInputList
 import com.zsoltbertalan.flickslate.shared.domain.model.Genre
 import kotlinx.serialization.Serializable
+import retrofit2.Response
 
 @Serializable
 data class GenreDto(
@@ -12,4 +13,4 @@ data class GenreDto(
 
 fun GenreDto.toGenre(): Genre = Genre(this.id, this.name)
 
-fun List<GenreDto>?.toGenreList(): List<Genre> = mapNullInputList(this) { genre -> genre.toGenre() }
+fun List<GenreDto>?.toGenresReply(): List<Genre> = mapNullInputList(this) { genre -> genre.toGenre() }
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreReplyDto.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreReplyDto.kt
index aa44ff9..5e1f109 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreReplyDto.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/data/network/model/GenreReplyDto.kt
@@ -1,11 +1,22 @@
 package com.zsoltbertalan.flickslate.search.data.network.model
 
+import com.babestudios.base.data.mapNullInputList
+import com.zsoltbertalan.flickslate.movies.data.network.model.toMoviesReply
 import com.zsoltbertalan.flickslate.shared.domain.model.Genre
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
 import kotlinx.serialization.Serializable
+import retrofit2.Response
 
 @Serializable
 data class GenreReplyDto(
 	val genres: List<GenreDto> = emptyList(),
 )
 
-fun GenreReplyDto.toGenres(): List<Genre> = this.genres.toGenreList()
+fun GenreReplyDto.toGenres(): List<Genre> = this.genres.toGenresReply()
+
+fun Response<GenreReplyDto>.toGenresReply(): GenresReply {
+	val body = this.body()!!
+	val genres = body.genres
+	val etag = this.headers()["etag"] ?: ""
+	return GenresReply(genres.map { it.toGenre() }, etag)
+}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/domain/api/GenreRepository.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/domain/api/GenreRepository.kt
index 8ef7ab9..1768d56 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/domain/api/GenreRepository.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/domain/api/GenreRepository.kt
@@ -1,14 +1,14 @@
 package com.zsoltbertalan.flickslate.search.domain.api
 
-import com.zsoltbertalan.flickslate.shared.util.Outcome
-import com.zsoltbertalan.flickslate.shared.domain.model.Genre
 import com.zsoltbertalan.flickslate.movies.domain.model.Movie
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
 import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
+import com.zsoltbertalan.flickslate.shared.util.Outcome
 import kotlinx.coroutines.flow.Flow
 
 interface GenreRepository {
 
-	fun getGenresList(): Flow<Outcome<List<Genre>>>
+	fun getGenresList(): Flow<Outcome<GenresReply>>
 	fun getGenreDetail(genreId: Int, page: Int): Flow<Outcome<PagingReply<Movie>>>
 
 }
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/repository/GenreAccessor.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/repository/GenreAccessor.kt
index d14f60d..a54a715 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/repository/GenreAccessor.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/repository/GenreAccessor.kt
@@ -1,19 +1,13 @@
 package com.zsoltbertalan.flickslate.search.repository
 
-import com.zsoltbertalan.flickslate.shared.domain.model.Genre
-import com.zsoltbertalan.flickslate.shared.domain.model.PageData
-import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
-import com.zsoltbertalan.flickslate.movies.data.network.model.MoviesReplyDto
-import com.zsoltbertalan.flickslate.movies.data.network.model.toMoviesReply
 import com.zsoltbertalan.flickslate.movies.domain.model.Movie
-import com.zsoltbertalan.flickslate.search.data.db.GenreDataSource
-import com.zsoltbertalan.flickslate.search.data.db.GenreMoviesDataSource
-import com.zsoltbertalan.flickslate.search.data.network.model.GenreReplyDto
-import com.zsoltbertalan.flickslate.search.data.network.model.toGenres
+import com.zsoltbertalan.flickslate.search.data.api.GenreDataSource
+import com.zsoltbertalan.flickslate.search.data.api.GenreMoviesDataSource
 import com.zsoltbertalan.flickslate.search.domain.api.GenreRepository
-import com.zsoltbertalan.flickslate.search.data.network.SearchService
 import com.zsoltbertalan.flickslate.shared.async.IoDispatcher
-import com.zsoltbertalan.flickslate.shared.data.getresult.fetchCacheThenNetworkResponse
+import com.zsoltbertalan.flickslate.shared.data.getresult.fetchCacheThenRemote
+import com.zsoltbertalan.flickslate.shared.domain.model.GenresReply
+import com.zsoltbertalan.flickslate.shared.domain.model.PagingReply
 import com.zsoltbertalan.flickslate.shared.util.Outcome
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
@@ -23,49 +17,39 @@ import javax.inject.Singleton
 
 @Singleton
 class GenreAccessor @Inject constructor(
-	private val searchService: SearchService,
-	private val genreDataSource: GenreDataSource,
-	private val genreMoviesDataSource: GenreMoviesDataSource,
+	private val genreDataSource: GenreDataSource.Local,
+	private val genreRemoteDataSource: GenreDataSource.Remote,
+	private val genreMoviesDataSource: GenreMoviesDataSource.Local,
+	private val genreMoviesRemoteDataSource: GenreMoviesDataSource.Remote,
 	@IoDispatcher val dispatcher: CoroutineDispatcher
 ) : GenreRepository {
 
-	override fun getGenresList(): Flow<Outcome<List<Genre>>> {
-		return fetchCacheThenNetworkResponse(
+	override fun getGenresList(): Flow<Outcome<GenresReply>> {
+		return fetchCacheThenRemote(
 			fetchFromLocal = { genreDataSource.getGenres() },
 			makeNetworkRequest = {
 				val etag = genreDataSource.getEtag()
-				searchService.getGenres(ifNoneMatch = etag)
+				genreRemoteDataSource.getGenres(etag = etag)
 			},
-			saveResponseData = { genreResponse ->
-				val etag = genreResponse.headers()["etag"] ?: ""
+			saveResponseData = { genresReply ->
+				val etag = genresReply.etag ?: ""
 				genreDataSource.insertEtag(etag)
-				val genres = genreResponse.body()?.toGenres().orEmpty()
-				genreDataSource.insertGenres(genres)
+				genreDataSource.insertGenres(genresReply.genres.orEmpty())
 			},
-			mapper = GenreReplyDto::toGenres,
 		).flowOn(dispatcher)
 	}
 
 	override fun getGenreDetail(genreId: Int, page: Int): Flow<Outcome<PagingReply<Movie>>> {
-		return fetchCacheThenNetworkResponse(
+		return fetchCacheThenRemote(
 			fetchFromLocal = { genreMoviesDataSource.getGenreMovies(page) },
-			makeNetworkRequest = { searchService.getGenreMovie(withGenres = genreId, page = page) },
-			saveResponseData = { response ->
-				val etag = response.headers()["etag"] ?: ""
-				val moviesReply = response.body()?.toMoviesReply()
+			makeNetworkRequest = { genreMoviesRemoteDataSource.getGenreMovies(genreId = genreId, page = page) },
+			saveResponseData = { pagingReply ->
+				val moviesReply = pagingReply.pagingList
 				genreMoviesDataSource.insertGenreMoviesPageData(
-					PageData(
-						page,
-						response.headers()["date"] ?: "",
-						response.headers()["x-memc-expires"]?.toInt() ?: 0,
-						etag,
-						response.body()?.total_pages ?: 0,
-						response.body()?.total_results ?: 0,
-					)
+					pagingReply.pageData
 				)
-				genreMoviesDataSource.insertGenreMovies(moviesReply?.pagingList.orEmpty(), page)
+				genreMoviesDataSource.insertGenreMovies(moviesReply, page)
 			},
-			mapper = MoviesReplyDto::toMoviesReply,
 		)
 	}
 
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/search/ui/main/SearchViewModel.kt b/app/src/main/java/com/zsoltbertalan/flickslate/search/ui/main/SearchViewModel.kt
index 0559f9e..72afa05 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/search/ui/main/SearchViewModel.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/search/ui/main/SearchViewModel.kt
@@ -79,7 +79,7 @@ class SearchViewModel @Inject constructor(
 				when {
 					response.isOk -> _searchStateData.update {
 						it.copy(
-							genreResult = response.value,
+							genreResult = response.value.genres.orEmpty(),
 						)
 					}
 
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/shared/data/getresult/fetchCacheThenNetwork.kt b/app/src/main/java/com/zsoltbertalan/flickslate/shared/data/getresult/fetchCacheThenNetwork.kt
index 65c8052..1b6af0a 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/shared/data/getresult/fetchCacheThenNetwork.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/shared/data/getresult/fetchCacheThenNetwork.kt
@@ -18,6 +18,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import retrofit2.Response
+import timber.log.Timber
 
 /**
  * A collection of generic Repository functions to handle common tasks like making network requests, fetching and
@@ -63,6 +64,7 @@ inline fun <DOMAIN> fetchCacheThenRemote(
 		}.recoverIf(
 			{ failure ->
 				println("failure: $failure")
+				Timber.d("zsoltbertalan* fetchCacheThenRemote: $failure")
 				failure == Failure.NotModified || localData != null },
 			{ null }
 		)
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/GenresReply.kt b/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/GenresReply.kt
new file mode 100644
index 0000000..e8010c6
--- /dev/null
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/GenresReply.kt
@@ -0,0 +1,9 @@
+package com.zsoltbertalan.flickslate.shared.domain.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+data class GenresReply(val genres: List<Genre>? = null, val etag: String? = null) : Parcelable
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PageData.kt b/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PageData.kt
index 906264f..1c010c0 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PageData.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PageData.kt
@@ -1,5 +1,8 @@
 package com.zsoltbertalan.flickslate.shared.domain.model
 
+/**
+ * Used to save paging metadata into the database.
+ */
 data class PageData(
 	val page: Int = 0,
 	val date: String = "",
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PagingReply.kt b/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PagingReply.kt
index f3f2dce..17d1025 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PagingReply.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/shared/domain/model/PagingReply.kt
@@ -4,7 +4,7 @@ package com.zsoltbertalan.flickslate.shared.domain.model
  * Class wrapping one page from a paging response
  * @param pagingList is the list
  * @param isLastPage is metadata used in the Presentation layer
- * @param pageData is metadata used to save paging metadata into the database
+ * @param pageData used to save paging metadata into the database
  */
 data class PagingReply<V>(
 	val pagingList: List<V>,
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/shared/util/Response.kt b/app/src/main/java/com/zsoltbertalan/flickslate/shared/util/Response.kt
index ed6b87b..9014c7c 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/shared/util/Response.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/shared/util/Response.kt
@@ -8,7 +8,7 @@ import com.zsoltbertalan.flickslate.shared.data.getresult.handle
 import retrofit2.Response
 
 /**
- * Executes a network a request, that returns a [retrofit2.Response].
+ * Executes a network request, that returns a [retrofit2.Response].
  *
  * @param makeNetworkRequest The request
  * @param mapper, which DOES NOT use the Response.
@@ -33,7 +33,7 @@ suspend inline fun <REMOTE, DOMAIN> safeCall(
 }
 
 /**
- * Executes a network a request, that returns a [retrofit2.Response].
+ * Executes a network request, that returns a [retrofit2.Response].
  *
  * @param makeNetworkRequest The request
  * @param mapper, which uses the Response metadata.
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/TvService.kt b/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/TvService.kt
index 77103b0..fedca77 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/TvService.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/TvService.kt
@@ -10,7 +10,6 @@ import retrofit2.http.Query
 
 const val URL_TV_TOP_RATED = "tv/top_rated"
 const val URL_TV_DETAILS = "tv/{series_id}"
-const val URL_DISCOVER_MOVIE = "discover/movie"
 
 interface TvService {
 
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TopRatedTvReplyDto.kt b/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TopRatedTvReplyDto.kt
index 2646fd9..c657123 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TopRatedTvReplyDto.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TopRatedTvReplyDto.kt
@@ -15,9 +15,6 @@ data class TopRatedTvReplyDto(
 	val results: List<TvDto>? = null,
 )
 
-fun TopRatedTvReplyDto.toTvList() =
-	PagingReply(this.results?.toTvList()?: emptyList(), page == total_pages, PageData())
-
 fun Response<TopRatedTvReplyDto>.toTvShowsReply(): PagingReply<TvShow> {
 	val body = this.body()!!
 	val etag = this.headers()["etag"] ?: ""
@@ -35,4 +32,5 @@ fun Response<TopRatedTvReplyDto>.toTvShowsReply(): PagingReply<TvShow> {
 			body.total_results ?: 0
 		)
 	)
-}
\ No newline at end of file
+
+}
diff --git a/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TvDetailsDto.kt b/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TvDetailsDto.kt
index 3b5473f..503dce0 100644
--- a/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TvDetailsDto.kt
+++ b/app/src/main/java/com/zsoltbertalan/flickslate/tv/data/network/model/TvDetailsDto.kt
@@ -1,7 +1,7 @@
 package com.zsoltbertalan.flickslate.tv.data.network.model
 
 import com.zsoltbertalan.flickslate.search.data.network.model.GenreDto
-import com.zsoltbertalan.flickslate.search.data.network.model.toGenreList
+import com.zsoltbertalan.flickslate.search.data.network.model.toGenresReply
 import com.zsoltbertalan.flickslate.tv.domain.model.TvDetail
 import kotlinx.serialization.Serializable
 
@@ -33,5 +33,5 @@ fun TvDetailsDto.toTvDetail() = TvDetail(
 	this.vote_average,
 	this.poster_path,
 	this.backdrop_path,
-	this.genres.toGenreList(),
+	this.genres.toGenresReply(),
 )