diff --git a/src/Umbraco.Examine/UmbracoExamineIndexer.cs b/src/Umbraco.Examine/UmbracoExamineIndexer.cs
index 64fd7b5c71..a4c1fb4336 100644
--- a/src/Umbraco.Examine/UmbracoExamineIndexer.cs
+++ b/src/Umbraco.Examine/UmbracoExamineIndexer.cs
@@ -418,7 +418,7 @@ namespace Umbraco.Examine
             //icon
             if (e.IndexItem.ValueSet.Values.TryGetValue("icon", out var icon) && e.IndexItem.ValueSet.Values.ContainsKey(IconFieldName) == false)
             {
-                e.IndexItem.ValueSet.Values[IconFieldName] = new List<object> { icon };
+                e.IndexItem.ValueSet.Values[IconFieldName] = icon;
             }
         }
 
diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs
index 530e8ba449..a1625206d1 100644
--- a/src/Umbraco.Web/Search/ExamineComponent.cs
+++ b/src/Umbraco.Web/Search/ExamineComponent.cs
@@ -317,7 +317,8 @@ namespace Umbraco.Web.Search
         private void ContentTypeCacheRefresherUpdated(ContentTypeCacheRefresher sender, CacheRefresherEventArgs args)
         {
 
-            //before content type changes just caused full blown re-indexing:
+            //before content type changes just didn't do anything for indexing, simply just updated the
+            //definitions to index:
             // https://github.com/umbraco/Umbraco-CMS/commit/ef013f9d3b945d0a48a306ff1afbd49c10c3fff8
 
 
@@ -331,8 +332,6 @@ namespace Umbraco.Web.Search
 
             var removedIds = new List<int>();
             var refreshedIds = new List<int>();
-
-            //TODO: What do we do about these?
             var otherIds = new List<int>();
 
             foreach (var payload in (ContentTypeCacheRefresher.JsonPayload[])args.MessageObject)
@@ -348,7 +347,7 @@ namespace Umbraco.Web.Search
             const int pageSize = 500;
 
             //Re-index all content of these types
-            foreach(var id in refreshedIds)
+            foreach(var id in refreshedIds.Concat(otherIds).Distinct())
             {
                 var page = 0;
                 var total = long.MaxValue;