diff --git a/server/AyaNova/biz/Search.cs b/server/AyaNova/biz/Search.cs
index 28c9313f..b80f13f2 100644
--- a/server/AyaNova/biz/Search.cs
+++ b/server/AyaNova/biz/Search.cs
@@ -54,10 +54,19 @@ namespace AyaNova.Biz
 
 
             //IF NOT NEW, DELETE ALL EXISTING ENTRIES FOR OBJECT TYPE AND ID
+            if (!newRecord)
+            {
+                ProcessDeletedObjectKeywords(ct, objectID, objectType);
+            }
 
-            //BREAK STRING ARRAY INTO KEYWORD ARRAY
+            //BREAK STRING ARRAY INTO KEYWORD LIST            
+            List<string> KeyWordList = Break(localeId, text);
 
             //EARLY EXIT IF NO KEYWORDS OR NAME RECORD TO PROCESS
+            if (KeyWordList.Count == 0 && string.IsNullOrWhiteSpace(name))
+            {
+                return;
+            }
 
             //ITERATE ALL THE KEYWORDS, SEARCH IN THE SEARCHDICTIONARY TABLE AND COLLECT ID'S OF ANY PRE-EXISTING IN DB KEYWORDS
 
@@ -134,10 +143,11 @@ namespace AyaNova.Biz
         /// 
         /// <param name="localeId"></param>
         /// <param name="text">An array of 0 to * strings of text</param>
-        /// <returns></returns>
-        internal static string Break(long localeId, params string[] text)
+        /// <returns>List of strings</returns>
+        internal static List<string> Break(long localeId, params string[] text)
         {
-            return BreakCore(localeId, false, text);
+            List<string> KeyWordList = new List<string>(BreakCore(localeId, false, text).Split(','));
+            return KeyWordList;
         }
 
         /// <summary>