diff --git a/server/AyaNova/biz/Search.cs b/server/AyaNova/biz/Search.cs
index 4857ec50..407c5929 100644
--- a/server/AyaNova/biz/Search.cs
+++ b/server/AyaNova/biz/Search.cs
@@ -117,7 +117,13 @@ namespace AyaNova.Biz
             
             q.Length=q.Length-2;//trim the final comma and space
 
-            q.Append(" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid GROUP BY asearchkey.objectid, asearchkey.atype) SELECT atype, objectid FROM qr WHERE ");
+            var qTypeOnly=string.Empty;
+            if(searchParameters.TypeOnly!=AyaType.NoType){
+                //INNER JOIN ASEARCHKEY ON ASEARCHDICTIONARY.ID = ASEARCHKEY.WORDID and asearchkey.atype=20
+                qTypeOnly=$"AND ASEARCHKEY.ATYPE={(int)searchParameters.TypeOnly}";
+            }
+
+            q.Append($" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid {qTypeOnly} GROUP BY asearchkey.objectid, asearchkey.atype) SELECT atype, objectid FROM qr WHERE ");
 
             for (; termCount > 0; termCount--)
                 q.Append($"st{termCount} > 0 {(termCount > 1 ? "AND " : "")}");