diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1825a650..49c9bd20 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,66 +1,66 @@
 {
-   // Use IntelliSense to find out which attributes exist for C# debugging
-   // Use hover for the description of the existing attributes
-   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-   "version": "0.2.0",
-   "configurations": [
-        {
-            "name": ".NET Core Launch (web)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/server/AyaNova/bin/Debug/netcoreapp2.1/AyaNova.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/server/AyaNova",
-            "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart",
-            "launchBrowser": {
-                "enabled": true,
-                "args": "${auto-detect-url}/api/v8/",
-                "windows": {
-                    "command": "cmd.exe",
-                    "args": "/C start http://localhost:7575/api/v8/"
-                },
-                "osx": {
-                    "command": "open"
-                },
-                "linux": {
-                    "command": "xdg-open"
-                }
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development",
-                "AYANOVA_LOG_LEVEL": "Info",
-                "AYANOVA_DEFAULT_LANGUAGE": "en",
-                //LOCALE MUST BE en for Integration TESTING
-                //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
-                "AYANOVA_DB_CONNECTION":"Server=localhost;Username=postgres;Password=raven;Database=AyaNova;",                
-                "AYANOVA_USE_URLS": "http://*:7575;",
-                "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
-                "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
-                "AYANOVA_METRICS_USE_INFLUXDB": "false"
-               
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
-            }
+  // Use IntelliSense to find out which attributes exist for C# debugging
+  // Use hover for the description of the existing attributes
+  // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET Core Launch (web)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/server/AyaNova/bin/Debug/netcoreapp2.1/AyaNova.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/server/AyaNova",
+      "stopAtEntry": false,
+      "internalConsoleOptions": "openOnSessionStart",
+      "launchBrowser": {
+        "enabled": true,
+        "args": "${auto-detect-url}/api/v8/",
+        "windows": {
+          "command": "cmd.exe",
+          "args": "/C start http://localhost:7575/api/v8/"
         },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
+        "osx": {
+          "command": "open"
+        },
+        "linux": {
+          "command": "xdg-open"
         }
-    ]
+      },
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "AYANOVA_LOG_LEVEL": "Info",
+        //"AYANOVA_LOG_LEVEL": "Debug",
+        "AYANOVA_DEFAULT_LANGUAGE": "en",
+        //LOCALE MUST BE en for Integration TESTING
+        //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
+        "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;",
+        "AYANOVA_USE_URLS": "http://*:7575;",
+        "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
+        "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
+        "AYANOVA_METRICS_USE_INFLUXDB": "false"
+      },
+      "sourceFileMap": {
+        "/Views": "${workspaceFolder}/Views"
+      }
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach",
+      "processId": "${command:pickProcess}"
+    }
+  ]
+
+  // "AYANOVA_DB_CONNECTION":"Server=localhost;Username=postgres;Password=raven;Database=ayanovadev",
+  //"AYANOVA_LOG_LEVEL": "Info"
+  //"AYANOVA_DB_CONNECTION":"Server=localhost;Username=postgres;Password=raven;Database=AyaNova",
+
+  // "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
+
+  //Development system folders
+  //"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
+  //"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
 }
-
-// "AYANOVA_DB_CONNECTION":"Server=localhost;Username=postgres;Password=raven;Database=ayanovadev",
-//"AYANOVA_LOG_LEVEL": "Info"
-//"AYANOVA_DB_CONNECTION":"Server=localhost;Username=postgres;Password=raven;Database=AyaNova",
-
-// "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
-
-//Development system folders
-//"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
-//"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
\ No newline at end of file
diff --git a/server/AyaNova/biz/Search.cs b/server/AyaNova/biz/Search.cs
index 9d68e2cc..61c47f7b 100644
--- a/server/AyaNova/biz/Search.cs
+++ b/server/AyaNova/biz/Search.cs
@@ -172,7 +172,6 @@ namespace AyaNova.Biz
             }
 
             //SEARCH SEARCHKEY FOR MATCHING WORDS AND OPTIONALLY TYPE AND INNAME
-            List<SearchKey> SearchKeyMatches = new List<SearchKey>();
 
             //Build search query based on searchParameters
             var q = ct.SearchKey.Distinct().Where(m => DictionaryMatches.Contains(m.Id));
@@ -187,21 +186,15 @@ namespace AyaNova.Biz
 
 
 
+            //Find the records that have all the words
             var SearchMatches = q.GroupBy(x => new { x.ObjectType, x.ObjectId }).Select(x => new { ObjectId = x.Key.ObjectId, ObjectType = x.Key.ObjectType, ObjectCount = x.LongCount() });
-            foreach (var SearchMatch in SearchMatches)
-            {
-                MatchingObjects.Add(new AyaTypeId(SearchMatch.ObjectType, SearchMatch.ObjectId));
-            }
-            //Trigger the search
-          //  SearchKeyMatches = await q.ToListAsync();
-
-            //      need to group by object type and id and count instead?
 
             //PUT THE RESULTS INTO MATCHING OBJECTS LIST
-            // foreach (SearchKey SearchKeyMatch in SearchKeyMatches)
-            // {
-            //     MatchingObjects.Add(new AyaTypeId(SearchKeyMatch.ObjectType, SearchKeyMatch.ObjectId));
-            // }
+            foreach (var SearchMatch in SearchMatches)
+            {
+                //Is this going to require checking the count??
+                MatchingObjects.Add(new AyaTypeId(SearchMatch.ObjectType, SearchMatch.ObjectId));
+            }
 
 
             //IF TAGS SPECIFIED