diff --git a/konova/autocompletes.py b/konova/autocompletes.py
index a75a711a..94798b96 100644
--- a/konova/autocompletes.py
+++ b/konova/autocompletes.py
@@ -107,7 +107,9 @@ class KonovaCodeAutocomplete(Select2QuerySetView):
             q_or = Q()
             q_or |= Q(long_name__icontains=self.q)
             q_or |= Q(short_name__icontains=self.q)
-            qs = qs.filter(q_or)
+            q_or |= Q(parent__long_name__icontains=self.q)
+            q_or |= Q(parent__short_name__icontains=self.q)
+            qs = qs.filter(q_or).distinct()
         return qs