diff --git a/oml/item/api.py b/oml/item/api.py
index 44162b2..101cc27 100644
--- a/oml/item/api.py
+++ b/oml/item/api.py
@@ -206,9 +206,9 @@ def autocomplete(data):
             qs = qs.filter(models.Find.findvalue.startswith(value))
         elif op == '$':
             qs = qs.filter(models.Find.findvalue.endswith(value))
-    qs = qs.group_by(models.Find.value)
     if add_itemsort:
         qs = qs.join(models.Item).join(models.Sort)
+    qs = qs.group_by(models.Find.findvalue)
     qs = qs.order_by(*order_by)
     response['items'] = [r.value for r in qs[data['range'][0]:data['range'][1]]]
     return response