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 231cbcf..cef183d 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
@@ -36,18 +36,13 @@ class PokeSearchViewModel(private val favouritesRepository: FavouritesRepository
         }
     }
 
-
-
     fun search(query: String) {
         viewModelScope.launch {
             try {
-                val filteredList = _initialPokemonList.value?.filter { it.name.contains(query, ignoreCase = true) }
+                val filteredList = _initialPokemonList.value?.filter { it.name.startsWith(query, ignoreCase = true) }
                 val detailsList = mutableListOf<PokemonDetails>()
                 if (filteredList != null) {
-                    for (pokemonSpecies in filteredList) {
-                        if (detailsList.size >= SHOW_LIMIT) {
-                            break
-                        }
+                    for (pokemonSpecies in filteredList.take(SHOW_LIMIT)) {
                         val details = service.getPokemonDetails(extractPokemonId(pokemonSpecies.url))
                         val isFavorite = favouritesRepository.isFavourite(details.id)
                         detailsList.add(details.copy(isFavorite = isFavorite))