diff --git a/src/components/pages/pokemon.jsx b/src/components/pages/pokemon.jsx
index ebc222d..d976850 100644
--- a/src/components/pages/pokemon.jsx
+++ b/src/components/pages/pokemon.jsx
@@ -19,7 +19,22 @@ const typeFilter = (type, data) => {
   if(type === 'all'){
     return data
   }else{
-    return data.filter(item=>(item.pokemon_v2_pokemontypes[0].pokemon_v2_type.name === type))
+    return data.filter(item=>{
+      let type_1
+      let type_2
+      if (item.pokemon_v2_pokemontypes.length === 2) {
+        type_1 = item.pokemon_v2_pokemontypes[0].pokemon_v2_type.name
+        type_2 = item.pokemon_v2_pokemontypes[1].pokemon_v2_type.name
+      }else{
+        type_1 = item.pokemon_v2_pokemontypes[0].pokemon_v2_type.name
+        type_2 = item.pokemon_v2_pokemontypes[0].pokemon_v2_type.name
+      }
+      if(type_1 === type || type_2 === type){
+        return true
+      }else{
+        return false
+      }
+    })
   }
 };
 
diff --git a/src/components/pokelist.jsx b/src/components/pokelist.jsx
index e12d1a0..2177ed3 100644
--- a/src/components/pokelist.jsx
+++ b/src/components/pokelist.jsx
@@ -156,8 +156,8 @@ function Pokelist({ favs, data, page, pageSize, dispatch }) {
                             </CardActions>
                            
                         </Card>
-                        <ListItem key={`pokemon_${pokemon.id}`} alignItems="center" sx={{ width: '100%', bgcolor: 'background.paper', height:'17.5vh', display: { xs: 'flex', sm: 'none' } }} >
-                            <Card sx={{ display: 'flex', width: '93vw', height: '15vh' }} key={pokemon.id}>
+                        <ListItem key={`pokemon_${pokemon.id}`} alignItems="center" sx={{ width: '100%', bgcolor: 'background.paper', height:'150px', display: { xs: 'flex', sm: 'none' } }} >
+                            <Card sx={{ display: 'flex', width: '93vw', height: '140px' }} key={pokemon.id}>
                                 <CardContent sx={{ flex: '1 1 auto', flexDirection: 'row' }}>
                                 <Stack sx={{ display: 'flex', 
                                              flexDirection: 'row', 
diff --git a/src/hooks/reducer.js b/src/hooks/reducer.js
index d4d5f9e..8b6ca4c 100644
--- a/src/hooks/reducer.js
+++ b/src/hooks/reducer.js
@@ -74,7 +74,7 @@ export const reducer = (state, action) => {
             localStorage.setItem('favIds', JSON.stringify(currentFavIds));
             return {...state, favs: newFavs, favIds: currentFavIds}
         case 'filterName':
-            return {...state, filterState: {...state.filterState, name: action.value}}
+            return {...state, filterState: {...state.filterState, name: action.value}, mainPage: {...state.mainPage, page: 1}, favPage: {...state.favPage, page: 1}}
         case 'filterType':
             let newType = action.value
             // console.log(newType)
@@ -85,7 +85,7 @@ export const reducer = (state, action) => {
             } else {
                 newType = 'all'
             }
-            return {...state, filterState: {...state.filterState, type: newType}}
+            return {...state, filterState: {...state.filterState, type: newType}, mainPage: {...state.mainPage, page: 1}, favPage: {...state.favPage, page: 1}}
         case 'login':
             //console.log('login got to the reducer')
             localStorage.setItem('login', 'true')
diff --git a/src/index.js b/src/index.js
index b598861..77c6b0e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,7 +8,7 @@ import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { checkValue } from './utils'
 
 const appName = 'pokedata'
-const version = '0.15'
+const version = '0.16'
 
 checkValue('appName', appName)
 checkValue('version', version)