diff --git a/Src/Common/Controls/XMLViews/ColumnConfigureDialog.cs b/Src/Common/Controls/XMLViews/ColumnConfigureDialog.cs
index 67cafd74ca..9f68e85151 100644
--- a/Src/Common/Controls/XMLViews/ColumnConfigureDialog.cs
+++ b/Src/Common/Controls/XMLViews/ColumnConfigureDialog.cs
@@ -383,9 +383,9 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 						}
 					}
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentAnalysisWritingSystems);
+						cache.ServiceLocator.WritingSystems.AnalysisWritingSystems);
 					break;
 				case WsComboContent.kwccAnalAndVern:
 					if (!skipDefaults)
@@ -403,9 +403,9 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 						}
 					}
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentAnalysisWritingSystems);
+						cache.ServiceLocator.WritingSystems.AnalysisWritingSystems);
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					break;
 				case WsComboContent.kwccBestAnalOrVern:
 					if (!skipDefaults)
@@ -424,9 +424,9 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 					}
 
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentAnalysisWritingSystems);
+						cache.ServiceLocator.WritingSystems.AnalysisWritingSystems);
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					break;
 				case WsComboContent.kwccBestAnalysis:
 					if (!skipDefaults)
@@ -440,7 +440,7 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 					}
 
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentAnalysisWritingSystems);
+						cache.ServiceLocator.WritingSystems.AnalysisWritingSystems);
 					break;
 				case WsComboContent.kwccBestVernacular:
 					if (!skipDefaults)
@@ -453,7 +453,7 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 						}
 					}
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					break;
 				case WsComboContent.kwccBestVernOrAnal:
 					if (!skipDefaults)
@@ -472,9 +472,9 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 					}
 
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentAnalysisWritingSystems);
+						cache.ServiceLocator.WritingSystems.AnalysisWritingSystems);
 					break;
 				case WsComboContent.kwccAnalysis:
 					if (!skipDefaults)
@@ -488,12 +488,12 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 					}
 
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentAnalysisWritingSystems);
+						cache.ServiceLocator.WritingSystems.AnalysisWritingSystems);
 					break;
 				case WsComboContent.kwccVernacularInParagraph:
 					items.Add(new WsComboItem(sVernacularInPara, "vern in para"));
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					break;
 				case WsComboContent.kwccVernacular:
 					if (!skipDefaults)
@@ -507,7 +507,7 @@ public static void AddWritingSystemsToCombo(LcmCache cache,
 					}
 
 					AddWritingSystemsToCombo(cache, items,
-						cache.ServiceLocator.WritingSystems.CurrentVernacularWritingSystems);
+						cache.ServiceLocator.WritingSystems.VernacularWritingSystems);
 					break;
 				case WsComboContent.kwccPronunciation:
 					if (!skipDefaults)