diff --git a/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt b/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt
index a318f12..db27440 100644
--- a/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt
@@ -18,7 +18,7 @@ import kotlinx.coroutines.launch
 import java.io.IOException
 
 class FavouritesViewModel(private val favouritesRepository: FavouritesRepository, featureManager: FeatureManager) : ViewModel() {
-    private val service = PokeApi.retrofitService;
+    private val service = PokeApi.retrofitService
 
     private val _pokemonDetails = MutableStateFlow<List<PokemonDetails>?>(null)
     val pokemonDetails: StateFlow<List<PokemonDetails>?> = _pokemonDetails.asStateFlow()
diff --git a/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt b/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt
index 8146c7f..231cbcf 100644
--- a/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt
+++ b/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt
@@ -44,7 +44,10 @@ class PokeSearchViewModel(private val favouritesRepository: FavouritesRepository
                 val filteredList = _initialPokemonList.value?.filter { it.name.contains(query, ignoreCase = true) }
                 val detailsList = mutableListOf<PokemonDetails>()
                 if (filteredList != null) {
-                    for (pokemonSpecies in filteredList.take(SHOW_LIMIT)) {
+                    for (pokemonSpecies in filteredList) {
+                        if (detailsList.size >= SHOW_LIMIT) {
+                            break
+                        }
                         val details = service.getPokemonDetails(extractPokemonId(pokemonSpecies.url))
                         val isFavorite = favouritesRepository.isFavourite(details.id)
                         detailsList.add(details.copy(isFavorite = isFavorite))