diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs
index 94498599..b7169905 100644
--- a/server/AyaNova/biz/PMBiz.cs
+++ b/server/AyaNova/biz/PMBiz.cs
@@ -593,7 +593,23 @@ namespace AyaNova.Biz
         public void DigestSearchText(PM obj, Search.SearchIndexProcessObjectParameters searchParams)
         {
             if (obj != null)
-                searchParams.AddText(obj.Notes).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                searchParams.AddText(obj.Notes)
+                    .AddText(obj.Serial)
+                    .AddText(obj.InternalReferenceNumber)
+                    .AddText(obj.CustomerReferenceNumber)
+                    .AddText(obj.CustomerContactName)
+                    .AddText(obj.PostAddress)
+                    .AddText(obj.PostCity)
+                    .AddText(obj.PostRegion)
+                    .AddText(obj.PostCountry)
+                    .AddText(obj.PostCode)
+                    .AddText(obj.Address)
+                    .AddText(obj.City)
+                    .AddText(obj.Region)
+                    .AddText(obj.Country)
+                    .AddText(obj.Wiki)
+                    .AddText(obj.Tags)
+                    .AddCustomFields(obj.CustomFields);
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1261,7 +1277,7 @@ namespace AyaNova.Biz
         {
             //SEARCH INDEXING
             var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, AyaType.PMItem);
-            SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+            SearchParams.AddText(obj.Notes).AddText(obj.TechNotes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
 
             if (isNew)
                 await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -1274,7 +1290,7 @@ namespace AyaNova.Biz
             var obj = await ct.PMItem.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# Note, intentionally not calling ItemGetAsync here as don't want whole graph
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                SearchParams.AddText(obj.Notes).AddText(obj.TechNotes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
             return SearchParams;
         }
 
@@ -4239,7 +4255,7 @@ namespace AyaNova.Biz
         {
             //SEARCH INDEXING
             var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
-            SearchParams.AddText(obj.Notes).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+           SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
 
             if (isNew)
                 await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -4252,7 +4268,7 @@ namespace AyaNova.Biz
             var obj = await UnitGetAsync(id, false);
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                SearchParams.AddText(obj.Notes).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
             return SearchParams;
         }
 
diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs
index 32c96ea4..64422d26 100644
--- a/server/AyaNova/biz/QuoteBiz.cs
+++ b/server/AyaNova/biz/QuoteBiz.cs
@@ -570,7 +570,24 @@ namespace AyaNova.Biz
         public void DigestSearchText(Quote obj, Search.SearchIndexProcessObjectParameters searchParams)
         {
             if (obj != null)
-                searchParams.AddText(obj.Notes).AddText(obj.Introduction).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                searchParams.AddText(obj.Notes)
+                    .AddText(obj.Introduction)
+                    .AddText(obj.Serial)
+                    .AddText(obj.InternalReferenceNumber)
+                    .AddText(obj.CustomerReferenceNumber)
+                    .AddText(obj.CustomerContactName)                   
+                    .AddText(obj.PostAddress)
+                    .AddText(obj.PostCity)
+                    .AddText(obj.PostRegion)
+                    .AddText(obj.PostCountry)
+                    .AddText(obj.PostCode)
+                    .AddText(obj.Address)
+                    .AddText(obj.City)
+                    .AddText(obj.Region)
+                    .AddText(obj.Country)
+                    .AddText(obj.Wiki)
+                    .AddText(obj.Tags)
+                    .AddCustomFields(obj.CustomFields);
         }
 
 
@@ -1463,7 +1480,7 @@ namespace AyaNova.Biz
         {
             //SEARCH INDEXING
             var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, AyaType.QuoteItem);
-            SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+            SearchParams.AddText(obj.Notes).AddText(obj.TechNotes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
 
             if (isNew)
                 await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -1476,7 +1493,7 @@ namespace AyaNova.Biz
             var obj = await ct.QuoteItem.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# Note, intentionally not calling ItemGetAsync here as don't want whole graph
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                SearchParams.AddText(obj.Notes).AddText(obj.TechNotes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
             return SearchParams;
         }
 
@@ -4553,7 +4570,7 @@ namespace AyaNova.Biz
         {
             //SEARCH INDEXING
             var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
-            SearchParams.AddText(obj.Notes).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+            SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
 
             if (isNew)
                 await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -4566,7 +4583,7 @@ namespace AyaNova.Biz
             var obj = await UnitGetAsync(id, false);
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                SearchParams.AddText(obj.Notes).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
             return SearchParams;
         }
 
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index a0f3b6e3..b7f05cc6 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -628,7 +628,26 @@ namespace AyaNova.Biz
         public void DigestSearchText(WorkOrder obj, Search.SearchIndexProcessObjectParameters searchParams)
         {
             if (obj != null)
-                searchParams.AddText(obj.Notes).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                searchParams.AddText(obj.Notes)
+                    .AddText(obj.Serial)
+                    .AddText(obj.InternalReferenceNumber)
+                    .AddText(obj.CustomerReferenceNumber)
+                    .AddText(obj.CustomerContactName)
+                    .AddText(obj.InvoiceNumber)
+                    .AddText(obj.CustomerSignatureName)
+                    .AddText(obj.TechSignatureName)
+                    .AddText(obj.PostAddress)
+                    .AddText(obj.PostCity)
+                    .AddText(obj.PostRegion)
+                    .AddText(obj.PostCountry)
+                    .AddText(obj.PostCode)
+                    .AddText(obj.Address)
+                    .AddText(obj.City)
+                    .AddText(obj.Region)
+                    .AddText(obj.Country)
+                    .AddText(obj.Wiki)
+                    .AddText(obj.Tags)
+                    .AddCustomFields(obj.CustomFields);
         }
 
 
@@ -1897,7 +1916,7 @@ namespace AyaNova.Biz
         {
             //SEARCH INDEXING
             var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, AyaType.WorkOrderItem);
-            SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+            SearchParams.AddText(obj.Notes).AddText(obj.TechNotes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
 
             if (isNew)
                 await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -1910,7 +1929,7 @@ namespace AyaNova.Biz
             var obj = await ct.WorkOrderItem.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# Note, intentionally not calling ItemGetAsync here as don't want whole graph
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                SearchParams.AddText(obj.Notes).AddText(obj.TechNotes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
             return SearchParams;
         }
 
@@ -5843,7 +5862,7 @@ namespace AyaNova.Biz
         {
             //SEARCH INDEXING
             var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
-            SearchParams.AddText(obj.Notes).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+            SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
 
             if (isNew)
                 await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -5856,7 +5875,7 @@ namespace AyaNova.Biz
             var obj = await UnitGetAsync(id, false);
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                SearchParams.AddText(obj.Notes).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
+                SearchParams.AddText(obj.Notes).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
             return SearchParams;
         }