diff --git a/pokedex/lookup.py b/pokedex/lookup.py
index 6d55aae..0cd813a 100644
--- a/pokedex/lookup.py
+++ b/pokedex/lookup.py
@@ -171,12 +171,12 @@ class PokedexLookup(object):
         """Creates the index from scratch."""
 
         schema = whoosh.fields.Schema(
-            name=whoosh.fields.ID(stored=True, spelling=True),
-            table=whoosh.fields.ID(stored=True),
-            row_id=whoosh.fields.ID(stored=True),
+            name=whoosh.fields.ID(sortable=True, stored=True, spelling=True),
+            table=whoosh.fields.ID(sortable=True, stored=True),
+            row_id=whoosh.fields.ID(sortable=True, stored=True),
             language=whoosh.fields.STORED,
-            iso639=whoosh.fields.ID(stored=True),
-            iso3166=whoosh.fields.ID(stored=True),
+            iso639=whoosh.fields.ID(sortable=True, stored=True),
+            iso3166=whoosh.fields.ID(sortable=True, stored=True),
             display_name=whoosh.fields.STORED,  # non-lowercased name
         )
 
diff --git a/setup.py b/setup.py
index a2cef50..5570bc9 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     },
     install_requires=[
         'SQLAlchemy>=0.7.3',
-        'whoosh>=2.2.2',
+        'whoosh>=2.5',
         'markdown',
         'construct',
     ],