diff --git a/pokedex/lookup.py b/pokedex/lookup.py
index bab2a42..0b09823 100644
--- a/pokedex/lookup.py
+++ b/pokedex/lookup.py
@@ -449,6 +449,8 @@ class PokedexLookup(object):
                 name, self.INTERMEDIATE_LOOKUP_RESULTS):
 
                 query = whoosh.query.Term('name', suggestion)
+                if type_term:
+                    query = query & type_term
                 results.extend(searcher.search(query))
 
         ### Convert results to db objects