diff --git a/src/EditorFeatures/Core/LanguageServiceIndexFormat/SymbolMoniker.cs b/src/EditorFeatures/Core/LanguageServiceIndexFormat/SymbolMoniker.cs
index d4b9a0f6ea8aad31e7fe19db14177db4506f105f..e194091e85f8feb11ecf433330873eeea68880fb 100644
--- a/src/EditorFeatures/Core/LanguageServiceIndexFormat/SymbolMoniker.cs
+++ b/src/EditorFeatures/Core/LanguageServiceIndexFormat/SymbolMoniker.cs
@@ -70,6 +70,7 @@ public SymbolMoniker(string scheme, string identifier)
 
             static string GetRequiredDocumentationCommentId(ISymbol symbol)
             {
+                symbol = symbol.OriginalDefinition;
                 var documentationCommentId = symbol.GetDocumentationCommentId();
 
                 if (documentationCommentId == null)
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index c70621baa59bb3e74885ada4ab425559a0ab017c..3a7999a1ecbe4b6bb0691fa43497003500cbeade 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1438,7 +1438,7 @@ I agree to all of the foregoing:</value>
     <value>Razor C# Language Server Client</value>
   </data>
   <data name="All_sources" xml:space="preserve">
-    <value>All sourcess</value>
+    <value>All sources</value>
   </data>
   <data name="Entire_repository" xml:space="preserve">
     <value>Entire repository</value>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index e2c8dd5b219977c8cdbf0bde59d59fd59edf43a4..f0f0b302ae44ceb5a380da836cc4410f745bf1b3 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index a21a1cf130b9333c6850702341353532ea200bec..f8b24290c349ca2c6d0a289d707c33598f4b3fd6 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index edd332156cdefda0debad999fdce0b0c66790c7e..6589188c9f09f8878fb08cc69e6637822ae6eab6 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index 5c8181903117110fa5023dfda01fa7045184047e..6f161883d5316a01e1b8883a6a0618a89db10ce0 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index 4ea6739cec8af6ee337b2605aaa3bb9487190228..c30456daef461262170509372603a284bcf235d2 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index 05f64038e8d2378b83e3a44fd75416e66f32da3c..322d9a3d61c647f39843da33dc7e706a62289f50 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index c40194a1b5aab32fe9642b7f97317b985f04f38f..08d2f4c1c5f284ca624714912a5db8c1113a0485 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index b7c7f1bf2237971bfbbcb132668314404a53cf4d..e995f6d3ee55afb1c36ac76f095125a7f1d8bd26 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 91c01abe653f690c2a3d4d23db1ed8e090fc8ed9..ef9a91ee6bb71df40b5d94947be70e2692aae940 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index fffd503e06a43292a0e46c282b38a5c67d3766a6..5a20c9e306b3bd0a2b83c587fa3264f69c433f6d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index 5db2ea39e95ddad89ffe21c80bbb25e0d795f290..6209a7fbcd5222ac15af07842be1eaad678128e1 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index 7c56568fe3b4a52eb40fe76a9a1b301eff594596..781ce17e9948cee6621c75e768a0d4c891eda1d2 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index 0dad2ea5d8018b5f40cee1e0f476d7f26f095d97..dc1649738d19299bf8562fc5bf58386c3f2f455a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -48,8 +48,8 @@
         <note />
       </trans-unit>
       <trans-unit id="All_sources">
-        <source>All sourcess</source>
-        <target state="new">All sourcess</target>
+        <source>All sources</source>
+        <target state="new">All sources</target>
         <note />
       </trans-unit>
       <trans-unit id="Allow_colon">