diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
index fa0b067c4..98a5d219b 100644
--- a/locales/Afrikaans.lng
+++ b/locales/Afrikaans.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
index c8bb410b7..e31db4829 100644
--- a/locales/Belarusian.lng
+++ b/locales/Belarusian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
index 60f43627d..21214e960 100644
--- a/locales/Chinese Simplified.lng	
+++ b/locales/Chinese Simplified.lng	
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
index 6f333fbd2..1cce7db67 100644
--- a/locales/Dutch.lng
+++ b/locales/Dutch.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/English.lng b/locales/English.lng
index 958207baf..0f10698f5 100644
--- a/locales/English.lng
+++ b/locales/English.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
index 9d4a08339..1efbf4a69 100644
--- a/locales/Hungarian.lng
+++ b/locales/Hungarian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
index 56d0ae767..111f88680 100644
--- a/locales/Icelandic.lng
+++ b/locales/Icelandic.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
index af4948a83..63d0a6c74 100644
--- a/locales/Japanese.lng
+++ b/locales/Japanese.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
index 2494c0a92..1ec242fb7 100644
--- a/locales/Kazakh (Cyrillic).lng	
+++ b/locales/Kazakh (Cyrillic).lng	
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
index 17bdb43d4..f3aad759b 100644
--- a/locales/Portuguese.lng
+++ b/locales/Portuguese.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
index 7576c5406..f736f99ef 100644
--- a/locales/Serbian (Latin).lng	
+++ b/locales/Serbian (Latin).lng	
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
index 73b5a4886..22659f73f 100644
--- a/locales/Spanish.lng
+++ b/locales/Spanish.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/czech.lng b/locales/czech.lng
index 28a88aaeb..6796b8e8b 100644
--- a/locales/czech.lng
+++ b/locales/czech.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/french.lng b/locales/french.lng
index 0f8403632..c325c8f06 100644
--- a/locales/french.lng
+++ b/locales/french.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/german.lng b/locales/german.lng
index b326c94a8..61c6b1dc2 100644
--- a/locales/german.lng
+++ b/locales/german.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 5a976e2c5..fbfbb0973 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added an option to disable the search for places without coordinates in geocoders (general maps).
             <li>Added the feature to display on maps all subordinate locations and persons of the selected hierarchy of locations.
             <li>Added mode for displaying parents' ages in tree diagrams.
             <li>Added an option to simplify the form of woman single surnames in extended mode (output without brackets if there are no other surnames).
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index 10a9c3564..5ba114fcb 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена опция выключения поиска мест без координат в геокодерах (общие карты).
             <li>Добавлена возможность выводить на карты все подчиненные места и персоны выбранной иерархии мест.
             <li>Добавлен режим отображения возрастов родителей в диаграммах деревьев.
             <li>Добавлена опция упрощения формы единственных фамилий женщин в расширенном режиме (вывод без скобок, если других фамилий нет).
diff --git a/locales/italian.lng b/locales/italian.lng
index bc583ab9a..d2287e3ec 100644
--- a/locales/italian.lng
+++ b/locales/italian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/polish.lng b/locales/polish.lng
index b0396e9f2..3ec81b7fd 100644
--- a/locales/polish.lng
+++ b/locales/polish.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/russian.lng b/locales/russian.lng
index c44fdc6d3..c8777c5a5 100644
--- a/locales/russian.lng
+++ b/locales/russian.lng
@@ -1011,3 +1011,5 @@
 998=Простая форма единственных фамилий
 999=Карта мест
 1000=Карта персон
+1001=Поиск в геокодерах мест без координат (карты)
+1002=Места и Карты
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
index cd41d7f30..5a66d4d72 100644
--- a/locales/ukrainian.lng
+++ b/locales/ukrainian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs b/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs
index 069ad0b68..4c06edf83 100644
--- a/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs
+++ b/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs
@@ -28,6 +28,7 @@
 using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Maps;
+using GKCore.Options;
 
 namespace GKCore.Controllers
 {
@@ -39,6 +40,7 @@ public sealed class MapsViewerWinController : FormController<IMapsViewerWin>
         private readonly List<GeoPoint> fMapPoints;
         private readonly List<GDMRecord> fSelectedPersons;
         private readonly Dictionary<string, MapPlace> fPlaces;
+        private readonly bool fSearchPlacesWithoutCoords;
 
         private ITVNode fBaseRoot;
 
@@ -52,6 +54,7 @@ public MapsViewerWinController(IMapsViewerWin view, List<GDMRecord> selectedPers
             fMapPoints = new List<GeoPoint>();
             fPlaces = new Dictionary<string, MapPlace>();
             fSelectedPersons = selectedPersons;
+            fSearchPlacesWithoutCoords = GlobalOptions.Instance.SearchPlacesWithoutCoords;
         }
 
         public void ShowFixedPoints(IEnumerable<GeoPoint> points)
@@ -87,26 +90,21 @@ private void LoadPlacesInt(StringList personValues, IProgressController progress
             GDMTree tree = fBase.Context.Tree;
             progress.Begin(LangMan.LS(LSID.LoadingLocations), tree.RecordsCount);
             try {
-                int num = tree.RecordsCount;
-                for (int i = 0; i < num; i++) {
-                    GDMRecord rec = tree[i];
-                    bool res = rec is GDMIndividualRecord && IsSelected(rec);
+                for (int i = 0, num = tree.RecordsCount; i < num; i++) {
+                    GDMIndividualRecord iRec = tree[i] as GDMIndividualRecord;
 
-                    if (res) {
-                        GDMIndividualRecord ind = rec as GDMIndividualRecord;
+                    if (iRec != null && IsSelected(iRec) && iRec.HasEvents) {
                         int pCnt = 0;
 
-                        int num2 = ind.Events.Count;
-                        for (int j = 0; j < num2; j++) {
-                            GDMCustomEvent ev = ind.Events[j];
+                        for (int j = 0, num2 = iRec.Events.Count; j < num2; j++) {
+                            GDMCustomEvent ev = iRec.Events[j];
                             if (ev.HasPlace && !string.IsNullOrEmpty(ev.Place.StringValue)) {
-                                AddPlace(ev.Place, ind, ev);
-                                pCnt++;
+                                pCnt += AddPlace(iRec, ev);
                             }
                         }
 
                         if (pCnt > 0) {
-                            personValues.AddObject(GKUtils.GetNameString(ind, true, false) + " [" + pCnt.ToString() + "]", ind);
+                            personValues.AddObject(GKUtils.GetNameString(iRec, true, false) + " [" + pCnt.ToString() + "]", iRec);
                         }
                     }
 
@@ -163,33 +161,42 @@ public void LoadPlaces()
                 fView.PersonsCombo.EndUpdate();
                 PlacesCache.Instance.Save();
             } catch (Exception ex) {
-                Logger.WriteError("MapsViewerWin.PlacesLoad()", ex);
+                Logger.WriteError("MapsViewerWinController.LoadPlaces()", ex);
             }
         }
 
-        private void AddPlace(GDMPlace place, GDMRecord owner, GDMCustomEvent placeEvent)
+        private int AddPlace(GDMRecord owner, GDMCustomEvent placeEvent)
         {
+            int result = 0;
             try {
+                GDMPlace place = placeEvent.Place;
                 var locRec = fBase.Context.Tree.GetPtrValue<GDMLocationRecord>(place.Location);
                 string placeName = (locRec != null) ? locRec.LocationName : place.StringValue;
 
-                MapPlace mapPlace;
+                MapPlace mapPlace = null;
                 if (!fPlaces.TryGetValue(placeName, out mapPlace)) {
-                    mapPlace = new MapPlace();
-                    mapPlace.Name = placeName;
-                    fPlaces.Add(placeName, mapPlace);
+                    bool hasCoords = locRec != null && !locRec.Map.IsEmpty();
 
-                    if (locRec == null) {
-                        PlacesCache.Instance.GetPlacePoints(placeName, mapPlace.Points);
-                    } else {
+                    if (hasCoords || fSearchPlacesWithoutCoords) {
+                        mapPlace = new MapPlace(placeName);
+                        fPlaces.Add(placeName, mapPlace);
+                    }
+
+                    if (hasCoords) {
                         mapPlace.Points.Add(new GeoPoint(locRec.Map.Lati, locRec.Map.Long, placeName));
+                    } else if (fSearchPlacesWithoutCoords) {
+                        PlacesCache.Instance.GetPlacePoints(placeName, mapPlace.Points);
                     }
                 }
 
-                mapPlace.PlaceRefs.Add(new PlaceRef(owner, placeEvent));
+                if (mapPlace != null) {
+                    mapPlace.PlaceRefs.Add(new PlaceRef(owner, placeEvent));
+                    result = 1;
+                }
             } catch (Exception ex) {
-                Logger.WriteError("MapsViewerWin.AddPlace()", ex);
+                Logger.WriteError("MapsViewerWinController.AddPlace()", ex);
             }
+            return result;
         }
 
         public void SetCenter()
@@ -261,7 +268,7 @@ public async void SaveSnapshot()
                     fView.MapBrowser.SaveSnapshot(fileName);
                 }
             } catch (Exception ex) {
-                Logger.WriteError("SaveSnapshot()", ex);
+                Logger.WriteError("MapsViewerWinController.SaveSnapshot()", ex);
                 AppHost.StdDialogs.ShowError("Image failed to save: " + ex.Message);
             }
         }
diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
index 5733d43b0..19e9c2d0c 100644
--- a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -58,6 +58,13 @@ public OptionsDlgController(IOptionsDlg view) : base(view)
             fView.EventTypesList.ListModel = new EventDefsListModel(fView, null, null);
         }
 
+        public void ChangeTab()
+        {
+            AcceptLanguage();
+            SetLocale();
+            UpdateView();
+        }
+
         private void FillGeoSearchCountries()
         {
             var combo = GetControl<IComboBox>("cmbGeoSearchCountry");
@@ -482,6 +489,7 @@ public void UpdateSpecials()
 
             GetControl<ICheckBox>("chkReversePlacesOrder").Checked = fOptions.ReversePlaceEntitiesOrder;
             GetControl<ICheckBox>("chkShowNumberOfSubstructures").Checked = fOptions.ShowNumberOfSubstructures;
+            GetControl<ICheckBox>("chkSearchPlacesWithoutCoords").Checked = fOptions.SearchPlacesWithoutCoords;
         }
 
         public void AcceptSpecials()
@@ -505,6 +513,7 @@ public void AcceptSpecials()
 
             fOptions.ReversePlaceEntitiesOrder = GetControl<ICheckBox>("chkReversePlacesOrder").Checked;
             fOptions.ShowNumberOfSubstructures = GetControl<ICheckBox>("chkShowNumberOfSubstructures").Checked;
+            fOptions.SearchPlacesWithoutCoords = GetControl<ICheckBox>("chkSearchPlacesWithoutCoords").Checked;
         }
 
         private void UpdateEventTypes()
@@ -1007,6 +1016,8 @@ public override void SetLocale()
 
             GetControl<ITabPage>("pageNavigation").Text = LangMan.LS(LSID.Navigation);
 
+            GetControl<ITabPage>("pageGeo").Text = LangMan.LS(LSID.LocationsAndMaps);
+
             // Pedigree
             GetControl<ITabPage>("pagePedigree").Text = LangMan.LS(LSID.Pedigrees);
 
@@ -1047,6 +1058,7 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkELAbbreviatedNames").Text = LangMan.LS(LSID.EL_AbbreviatedNames);
             GetControl<ICheckBox>("chkReversePlacesOrder").Text = LangMan.LS(LSID.ReversePlacesOrder);
             GetControl<ICheckBox>("chkShowNumberOfSubstructures").Text = LangMan.LS(LSID.ShowNumberOfSubstructures);
+            GetControl<ICheckBox>("chkSearchPlacesWithoutCoords").Text = LangMan.LS(LSID.SearchPlacesWithoutCoords);
 
             // event types
             GetControl<ITabPage>("pageEventTypes").Text = LangMan.LS(LSID.EventTypes);
diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
index 8b8dd09f5..093bc5cf2 100644
--- a/projects/GKCore/GKCore/LangMan.cs
+++ b/projects/GKCore/GKCore/LangMan.cs
@@ -1075,8 +1075,10 @@ public enum LSID
         /* 998 */ SimpleSingleSurnames,
         /* 999 */ MapOfPlaces,
         /* 1000 */ MapOfPersons,
+        /* 1001 */ SearchPlacesWithoutCoords,
+        /* 1002 */ LocationsAndMaps,
 
-        /* 000 */ Last = MapOfPersons
+        /* 000 */ Last = LocationsAndMaps
     }
 
 
@@ -2105,6 +2107,8 @@ public static class LangMan
             /* 998 */ "Simple form of single surnames",
             /* 999 */ "Map of places",
             /* 1000 */ "Map of persons",
+            /* 1001 */ "Search in geocoders for places without coordinates (maps)",
+            /* 1002 */ "Locations and Maps",
         };
 
         private static readonly LangManager fLangMan = new LangManager();
diff --git a/projects/GKCore/GKCore/Maps/PlacesLoader.cs b/projects/GKCore/GKCore/Maps/PlacesLoader.cs
index 7eb409d8a..9daf16b7b 100644
--- a/projects/GKCore/GKCore/Maps/PlacesLoader.cs
+++ b/projects/GKCore/GKCore/Maps/PlacesLoader.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -52,8 +52,9 @@ public class MapPlace
         public readonly List<GeoPoint> Points;
         public readonly List<PlaceRef> PlaceRefs;
 
-        public MapPlace()
+        public MapPlace(string name)
         {
+            Name = name;
             Points = new List<GeoPoint>();
             PlaceRefs = new List<PlaceRef>();
         }
diff --git a/projects/GKCore/GKCore/Options/GlobalOptions.cs b/projects/GKCore/GKCore/Options/GlobalOptions.cs
index 4af49c6cc..be5eae0a1 100644
--- a/projects/GKCore/GKCore/Options/GlobalOptions.cs
+++ b/projects/GKCore/GKCore/Options/GlobalOptions.cs
@@ -254,6 +254,11 @@ public StringList ResidenceFilters
 
         public bool SearchAndFilterByAllNames { get; set; }
 
+        /// <summary>
+        /// Maps.
+        /// </summary>
+        public bool SearchPlacesWithoutCoords { get; set; }
+
         public bool ShortKinshipForm { get; set; }
 
         public bool ShowDatesCalendar { get; set; }
@@ -423,6 +428,9 @@ public void ResetDefaults_Specials()
             EL_AbbreviatedNames = true;
 
             ShowNumberOfSubstructures = false;
+
+            // maps?
+            SearchPlacesWithoutCoords = false;
         }
 
         public void Assign(IOptions source)
@@ -844,6 +852,7 @@ public void LoadFromFile(IniFile ini)
             ShowIndiNamesakes = ini.ReadBool("Common", "ShowIndiNamesakes", false);
             ShowNumberOfSubstructures = ini.ReadBool("Common", "ShowNumberOfSubstructures", false);
             MatchPatternMethod = (MatchPatternMethod)ini.ReadInteger("Common", "MatchPatternMethod", 0);
+            SearchPlacesWithoutCoords = ini.ReadBool("Common", "SearchPlacesWithoutCoords", false);
 
             Theme = ini.ReadString("Common", "Theme", "");
 
@@ -997,6 +1006,7 @@ public void SaveToFile(IniFile ini)
             ini.WriteBool("Common", "ShowIndiNamesakes", ShowIndiNamesakes);
             ini.WriteBool("Common", "ShowNumberOfSubstructures", ShowNumberOfSubstructures);
             ini.WriteInteger("Common", "MatchPatternMethod", (int)MatchPatternMethod);
+            ini.WriteBool("Common", "SearchPlacesWithoutCoords", SearchPlacesWithoutCoords);
 
             ini.WriteString("Common", "Theme", Theme);
 
diff --git a/projects/GKTests/GKCore/PlacesLoaderTests.cs b/projects/GKTests/GKCore/PlacesLoaderTests.cs
index b59c145c5..1c9e02b06 100644
--- a/projects/GKTests/GKCore/PlacesLoaderTests.cs
+++ b/projects/GKTests/GKCore/PlacesLoaderTests.cs
@@ -46,7 +46,7 @@ public void Test_PlaceRef()
         [Test]
         public void Test_MapPlace()
         {
-            var mapPlace = new MapPlace();
+            var mapPlace = new MapPlace(string.Empty);
             Assert.IsNotNull(mapPlace);
             Assert.IsNotNull(mapPlace.Points);
             Assert.IsNotNull(mapPlace.PlaceRefs);
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
index e96e65b3a..3a23ba08e 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
@@ -197,6 +197,8 @@ partial class OptionsDlg
         private System.Windows.Forms.TabPage pageNavigation;
         private System.Windows.Forms.CheckBox chkPortraits;
         private System.Windows.Forms.CheckBox chkSimpleSingleSurnames;
+        private System.Windows.Forms.CheckBox chkSearchPlacesWithoutCoords;
+        private System.Windows.Forms.TabPage pageGeo;
 
         private void InitializeComponent()
         {
@@ -395,6 +397,8 @@ private void InitializeComponent()
             this.pageNavigation = new System.Windows.Forms.TabPage();
             this.chkPortraits = new System.Windows.Forms.CheckBox();
             this.chkSimpleSingleSurnames = new System.Windows.Forms.CheckBox();
+            this.chkSearchPlacesWithoutCoords = new System.Windows.Forms.CheckBox();
+            this.pageGeo = new System.Windows.Forms.TabPage();
             this.PageControl1.SuspendLayout();
             this.pageCommon.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -440,6 +444,7 @@ private void InitializeComponent()
             this.pageSpecials.SuspendLayout();
             this.pageEventTypes.SuspendLayout();
             this.pageNavigation.SuspendLayout();
+            this.pageGeo.SuspendLayout();
             this.SuspendLayout();
             // 
             // PageControl1
@@ -465,13 +470,9 @@ private void InitializeComponent()
             this.pageCommon.Controls.Add(this.lblCertaintyAlgorithm);
             this.pageCommon.Controls.Add(this.cmbCertaintyAlgorithm);
             this.pageCommon.Controls.Add(this.groupBox1);
-            this.pageCommon.Controls.Add(this.lblGeoSearchCountry);
-            this.pageCommon.Controls.Add(this.lblGeocoder);
             this.pageCommon.Controls.Add(this.lblLanguage);
             this.pageCommon.Controls.Add(this.grpInternet);
             this.pageCommon.Controls.Add(this.grpOther);
-            this.pageCommon.Controls.Add(this.cmbGeoSearchCountry);
-            this.pageCommon.Controls.Add(this.cmbGeocoder);
             this.pageCommon.Controls.Add(this.cmbLanguages);
             this.pageCommon.Location = new System.Drawing.Point(4, 26);
             this.pageCommon.Margin = new System.Windows.Forms.Padding(2);
@@ -481,10 +482,29 @@ private void InitializeComponent()
             this.pageCommon.TabIndex = 0;
             this.pageCommon.Text = "pageCommon";
             // 
+            // lblLanguage
+            // 
+            this.lblLanguage.AutoSize = true;
+            this.lblLanguage.Location = new System.Drawing.Point(11, 516);
+            this.lblLanguage.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblLanguage.Name = "lblLanguage";
+            this.lblLanguage.Size = new System.Drawing.Size(80, 17);
+            this.lblLanguage.TabIndex = 0;
+            this.lblLanguage.Text = "lblLanguage";
+            // 
+            // cmbLanguages
+            // 
+            this.cmbLanguages.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbLanguages.Location = new System.Drawing.Point(104, 512);
+            this.cmbLanguages.Margin = new System.Windows.Forms.Padding(2);
+            this.cmbLanguages.Name = "cmbLanguages";
+            this.cmbLanguages.Size = new System.Drawing.Size(230, 25);
+            this.cmbLanguages.TabIndex = 4;
+            // 
             // lblCertaintyAlgorithm
             // 
             this.lblCertaintyAlgorithm.AutoSize = true;
-            this.lblCertaintyAlgorithm.Location = new System.Drawing.Point(290, 595);
+            this.lblCertaintyAlgorithm.Location = new System.Drawing.Point(11, 555);
             this.lblCertaintyAlgorithm.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblCertaintyAlgorithm.Name = "lblCertaintyAlgorithm";
             this.lblCertaintyAlgorithm.Size = new System.Drawing.Size(125, 17);
@@ -494,7 +514,7 @@ private void InitializeComponent()
             // cmbCertaintyAlgorithm
             // 
             this.cmbCertaintyAlgorithm.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbCertaintyAlgorithm.Location = new System.Drawing.Point(562, 591);
+            this.cmbCertaintyAlgorithm.Location = new System.Drawing.Point(300, 551);
             this.cmbCertaintyAlgorithm.Margin = new System.Windows.Forms.Padding(2);
             this.cmbCertaintyAlgorithm.Name = "cmbCertaintyAlgorithm";
             this.cmbCertaintyAlgorithm.Size = new System.Drawing.Size(138, 25);
@@ -634,36 +654,6 @@ private void InitializeComponent()
             this.radFBNone.Text = "radFBNone";
             this.radFBNone.UseVisualStyleBackColor = true;
             // 
-            // lblGeoSearchCountry
-            // 
-            this.lblGeoSearchCountry.AutoSize = true;
-            this.lblGeoSearchCountry.Location = new System.Drawing.Point(290, 548);
-            this.lblGeoSearchCountry.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.lblGeoSearchCountry.Name = "lblGeoSearchCountry";
-            this.lblGeoSearchCountry.Size = new System.Drawing.Size(216, 17);
-            this.lblGeoSearchCountry.TabIndex = 0;
-            this.lblGeoSearchCountry.Text = "Restriction geo search by country";
-            // 
-            // lblGeocoder
-            // 
-            this.lblGeocoder.AutoSize = true;
-            this.lblGeocoder.Location = new System.Drawing.Point(359, 516);
-            this.lblGeocoder.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.lblGeocoder.Name = "lblGeocoder";
-            this.lblGeocoder.Size = new System.Drawing.Size(79, 17);
-            this.lblGeocoder.TabIndex = 0;
-            this.lblGeocoder.Text = "lblGeocoder";
-            // 
-            // lblLanguage
-            // 
-            this.lblLanguage.AutoSize = true;
-            this.lblLanguage.Location = new System.Drawing.Point(11, 516);
-            this.lblLanguage.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.lblLanguage.Name = "lblLanguage";
-            this.lblLanguage.Size = new System.Drawing.Size(80, 17);
-            this.lblLanguage.TabIndex = 0;
-            this.lblLanguage.Text = "lblLanguage";
-            // 
             // grpInternet
             // 
             this.grpInternet.Controls.Add(this.lblProxyServer);
@@ -834,40 +824,6 @@ private void InitializeComponent()
             this.chkShowOnStart.TabIndex = 0;
             this.chkShowOnStart.Text = "chkShowOnStart";
             // 
-            // cmbGeoSearchCountry
-            // 
-            this.cmbGeoSearchCountry.Items.AddRange(new object[] {
-            "Google",
-            "Yandex",
-            "OSM"});
-            this.cmbGeoSearchCountry.Location = new System.Drawing.Point(562, 544);
-            this.cmbGeoSearchCountry.Margin = new System.Windows.Forms.Padding(2);
-            this.cmbGeoSearchCountry.Name = "cmbGeoSearchCountry";
-            this.cmbGeoSearchCountry.Size = new System.Drawing.Size(138, 25);
-            this.cmbGeoSearchCountry.TabIndex = 4;
-            // 
-            // cmbGeocoder
-            // 
-            this.cmbGeocoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbGeocoder.Items.AddRange(new object[] {
-            "Google",
-            "Yandex",
-            "OSM"});
-            this.cmbGeocoder.Location = new System.Drawing.Point(470, 512);
-            this.cmbGeocoder.Margin = new System.Windows.Forms.Padding(2);
-            this.cmbGeocoder.Name = "cmbGeocoder";
-            this.cmbGeocoder.Size = new System.Drawing.Size(230, 25);
-            this.cmbGeocoder.TabIndex = 4;
-            // 
-            // cmbLanguages
-            // 
-            this.cmbLanguages.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbLanguages.Location = new System.Drawing.Point(104, 512);
-            this.cmbLanguages.Margin = new System.Windows.Forms.Padding(2);
-            this.cmbLanguages.Name = "cmbLanguages";
-            this.cmbLanguages.Size = new System.Drawing.Size(230, 25);
-            this.cmbLanguages.TabIndex = 4;
-            // 
             // pageMultimedia
             // 
             this.pageMultimedia.BackColor = System.Drawing.SystemColors.Control;
@@ -1842,6 +1798,7 @@ private void InitializeComponent()
             this.PageControl2.Controls.Add(this.pageViewCommon);
             this.PageControl2.Controls.Add(this.pageViewPersons);
             this.PageControl2.Controls.Add(this.pageNavigation);
+            this.PageControl2.Controls.Add(this.pageGeo);
             this.PageControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.PageControl2.Location = new System.Drawing.Point(10, 10);
             this.PageControl2.Margin = new System.Windows.Forms.Padding(2);
@@ -2218,6 +2175,104 @@ private void InitializeComponent()
             this.pageNavigation.TabIndex = 1;
             this.pageNavigation.Text = "pageNavigation";
             // 
+            // pageGeo
+            // 
+            this.pageGeo.Controls.Add(this.lblGeoSearchCountry);
+            this.pageGeo.Controls.Add(this.lblGeocoder);
+            this.pageGeo.Controls.Add(this.cmbGeoSearchCountry);
+            this.pageGeo.Controls.Add(this.cmbGeocoder);
+            this.pageGeo.Controls.Add(this.chkExtendedLocations);
+            this.pageGeo.Controls.Add(this.chkELAbbreviatedNames);
+            this.pageGeo.Controls.Add(this.chkReversePlacesOrder);
+            this.pageGeo.Controls.Add(this.chkSearchPlacesWithoutCoords);
+            this.pageGeo.Location = new System.Drawing.Point(4, 26);
+            this.pageGeo.Margin = new System.Windows.Forms.Padding(2);
+            this.pageGeo.Name = "pageGeo";
+            this.pageGeo.Size = new System.Drawing.Size(713, 712);
+            this.pageGeo.TabIndex = 1;
+            this.pageGeo.Text = "pageGeo";
+            // 
+            // lblGeocoder
+            // 
+            this.lblGeocoder.AutoSize = true;
+            this.lblGeocoder.Location = new System.Drawing.Point(11, 8);
+            this.lblGeocoder.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblGeocoder.Name = "lblGeocoder";
+            this.lblGeocoder.Size = new System.Drawing.Size(79, 17);
+            this.lblGeocoder.TabIndex = 0;
+            this.lblGeocoder.Text = "lblGeocoder";
+            // 
+            // cmbGeocoder
+            // 
+            this.cmbGeocoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbGeocoder.Items.AddRange(new object[] {
+            "Google",
+            "Yandex",
+            "OSM"});
+            this.cmbGeocoder.Location = new System.Drawing.Point(300, 8);
+            this.cmbGeocoder.Margin = new System.Windows.Forms.Padding(2);
+            this.cmbGeocoder.Name = "cmbGeocoder";
+            this.cmbGeocoder.Size = new System.Drawing.Size(230, 25);
+            this.cmbGeocoder.TabIndex = 4;
+            // 
+            // lblGeoSearchCountry
+            // 
+            this.lblGeoSearchCountry.AutoSize = true;
+            this.lblGeoSearchCountry.Location = new System.Drawing.Point(11, 34);
+            this.lblGeoSearchCountry.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblGeoSearchCountry.Name = "lblGeoSearchCountry";
+            this.lblGeoSearchCountry.Size = new System.Drawing.Size(216, 17);
+            this.lblGeoSearchCountry.TabIndex = 0;
+            this.lblGeoSearchCountry.Text = "Restriction geo search by country";
+            // 
+            // cmbGeoSearchCountry
+            // 
+            this.cmbGeoSearchCountry.Items.AddRange(new object[] {
+            "Google",
+            "Yandex",
+            "OSM"});
+            this.cmbGeoSearchCountry.Location = new System.Drawing.Point(300, 34);
+            this.cmbGeoSearchCountry.Margin = new System.Windows.Forms.Padding(2);
+            this.cmbGeoSearchCountry.Name = "cmbGeoSearchCountry";
+            this.cmbGeoSearchCountry.Size = new System.Drawing.Size(138, 25);
+            this.cmbGeoSearchCountry.TabIndex = 4;
+            // 
+            // chkExtendedLocations
+            // 
+            this.chkExtendedLocations.Location = new System.Drawing.Point(11, 70);
+            this.chkExtendedLocations.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
+            this.chkExtendedLocations.Name = "chkExtendedLocations";
+            this.chkExtendedLocations.Size = new System.Drawing.Size(600, 22);
+            this.chkExtendedLocations.TabIndex = 18;
+            this.chkExtendedLocations.Text = "chkExtendedLocations";
+            // 
+            // chkELAbbreviatedNames
+            // 
+            this.chkELAbbreviatedNames.Location = new System.Drawing.Point(41, 96);
+            this.chkELAbbreviatedNames.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
+            this.chkELAbbreviatedNames.Name = "chkELAbbreviatedNames";
+            this.chkELAbbreviatedNames.Size = new System.Drawing.Size(600, 22);
+            this.chkELAbbreviatedNames.TabIndex = 18;
+            this.chkELAbbreviatedNames.Text = "chkELAbbreviatedNames";
+            // 
+            // chkReversePlacesOrder
+            // 
+            this.chkReversePlacesOrder.Location = new System.Drawing.Point(11, 122);
+            this.chkReversePlacesOrder.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
+            this.chkReversePlacesOrder.Name = "chkReversePlacesOrder";
+            this.chkReversePlacesOrder.Size = new System.Drawing.Size(600, 22);
+            this.chkReversePlacesOrder.TabIndex = 19;
+            this.chkReversePlacesOrder.Text = "chkReversePlacesOrder";
+            // 
+            // chkSearchPlacesWithoutCoords
+            // 
+            this.chkSearchPlacesWithoutCoords.Location = new System.Drawing.Point(11, 148);
+            this.chkSearchPlacesWithoutCoords.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
+            this.chkSearchPlacesWithoutCoords.Name = "chkSearchPlacesWithoutCoords";
+            this.chkSearchPlacesWithoutCoords.Size = new System.Drawing.Size(600, 22);
+            this.chkSearchPlacesWithoutCoords.TabIndex = 20;
+            this.chkSearchPlacesWithoutCoords.Text = "chkSearchPlacesWithoutCoords";
+            // 
             // panel1
             // 
             this.panel1.Controls.Add(this.lstPersonColumns);
@@ -2406,9 +2461,6 @@ private void InitializeComponent()
             this.pageSpecials.Controls.Add(this.chkKeepInfoPansOverallSize);
             this.pageSpecials.Controls.Add(this.chkFilesOverwriteWarn);
             this.pageSpecials.Controls.Add(this.chkExtendedKinships);
-            this.pageSpecials.Controls.Add(this.chkExtendedLocations);
-            this.pageSpecials.Controls.Add(this.chkELAbbreviatedNames);
-            this.pageSpecials.Controls.Add(this.chkReversePlacesOrder);
             this.pageSpecials.Controls.Add(this.chkShowNumberOfSubstructures);
             this.pageSpecials.BackColor = System.Drawing.SystemColors.Control;
             this.pageSpecials.Location = new System.Drawing.Point(4, 26);
@@ -2519,33 +2571,6 @@ private void InitializeComponent()
             this.chkExtendedKinships.TabIndex = 17;
             this.chkExtendedKinships.Text = "chkExtendedKinships";
             // 
-            // chkExtendedLocations
-            // 
-            this.chkExtendedLocations.Location = new System.Drawing.Point(20, 361);
-            this.chkExtendedLocations.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
-            this.chkExtendedLocations.Name = "chkExtendedLocations";
-            this.chkExtendedLocations.Size = new System.Drawing.Size(600, 22);
-            this.chkExtendedLocations.TabIndex = 18;
-            this.chkExtendedLocations.Text = "chkExtendedLocations";
-            // 
-            // chkELAbbreviatedNames
-            // 
-            this.chkELAbbreviatedNames.Location = new System.Drawing.Point(50, 392);
-            this.chkELAbbreviatedNames.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
-            this.chkELAbbreviatedNames.Name = "chkELAbbreviatedNames";
-            this.chkELAbbreviatedNames.Size = new System.Drawing.Size(600, 22);
-            this.chkELAbbreviatedNames.TabIndex = 18;
-            this.chkELAbbreviatedNames.Text = "chkELAbbreviatedNames";
-            // 
-            // chkReversePlacesOrder
-            // 
-            this.chkReversePlacesOrder.Location = new System.Drawing.Point(20, 423);
-            this.chkReversePlacesOrder.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
-            this.chkReversePlacesOrder.Name = "chkReversePlacesOrder";
-            this.chkReversePlacesOrder.Size = new System.Drawing.Size(600, 22);
-            this.chkReversePlacesOrder.TabIndex = 19;
-            this.chkReversePlacesOrder.Text = "chkReversePlacesOrder";
-            // 
             // chkShowNumberOfSubstructures
             // 
             this.chkShowNumberOfSubstructures.Location = new System.Drawing.Point(20, 454);
@@ -2714,6 +2739,8 @@ private void InitializeComponent()
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OptionsDlg";
             this.Title = "OptionsDlg";
+            this.pageGeo.ResumeLayout(false);
+            this.pageGeo.PerformLayout();
             this.PageControl1.ResumeLayout(false);
             this.pageCommon.ResumeLayout(false);
             this.pageCommon.PerformLayout();
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs
index 42e581222..f3c2928ed 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.cs
@@ -72,9 +72,7 @@ public OptionsDlg(IHost host)
         private void PageControl_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (PageControl1.SelectedTab == pageEventTypes) {
-                fController.AcceptLanguage();
-                fController.SetLocale();
-                fController.UpdateView();
+                fController.ChangeTab();
             }
 
             btnResetDefaults.Enabled = PageControl1.SelectedIndex < 6;
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
index 028cd7f0b..e22e1d2db 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
@@ -259,9 +259,7 @@ public OptionsDlg(IHost host)
         private void PageControl_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (PageControl1.SelectedPage == pageEventTypes) {
-                fController.AcceptLanguage();
-                fController.SetLocale();
-                fController.UpdateView();
+                fController.ChangeTab();
             }
 
             btnResetDefaults.Enabled = PageControl1.SelectedIndex < 6;
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
index 8be36e45b..3288eb8d3 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
@@ -29,20 +29,6 @@
                       <ComboBox x:Name="cmbLanguages" ReadOnly="True" />
                     </TableRow>
 
-                    <TableRow>
-                      <Label x:Name="lblGeocoder" />
-                      <ComboBox x:Name="cmbGeocoder" ReadOnly="True">
-                        <ListItem>Google</ListItem>
-                        <ListItem>Yandex</ListItem>
-                        <ListItem>OSM</ListItem>
-                      </ComboBox>
-                    </TableRow>
-
-                    <TableRow>
-                      <Label x:Name="lblGeoSearchCountry" />
-                      <ComboBox x:Name="cmbGeoSearchCountry" ReadOnly="True" />
-                    </TableRow>
-
                     <TableRow>
                       <Label x:Name="lblCertaintyAlgorithm" />
                       <ComboBox x:Name="cmbCertaintyAlgorithm" ReadOnly="True" />
@@ -446,6 +432,37 @@
               </StackLayout>
             </TabPage>
 
+            <TabPage x:Name="pageGeo">
+              <StackLayout Style="vertListStack">
+
+                <TableLayout Spacing="4, 4">
+                  <TableRow>
+                    <Label x:Name="lblGeocoder" />
+                    <ComboBox x:Name="cmbGeocoder" ReadOnly="True">
+                      <ListItem>Google</ListItem>
+                      <ListItem>Yandex</ListItem>
+                      <ListItem>OSM</ListItem>
+                    </ComboBox>
+                  </TableRow>
+
+                  <TableRow>
+                    <Label x:Name="lblGeoSearchCountry" />
+                    <ComboBox x:Name="cmbGeoSearchCountry" ReadOnly="True" />
+                  </TableRow>
+                </TableLayout>
+
+                <CheckBox x:Name="chkExtendedLocations" />
+                <StackLayout Orientation="Horizontal" Spacing="20">
+                  <StackLayoutItem />
+                  <CheckBox x:Name="chkELAbbreviatedNames" />
+                </StackLayout>
+                <CheckBox x:Name="chkReversePlacesOrder" />
+                <CheckBox x:Name="chkSearchPlacesWithoutCoords" />
+
+                <StackLayoutItem Expand="True" />
+              </StackLayout>
+            </TabPage>
+
           </TabControl>
 
         </TabPage>
@@ -500,15 +517,6 @@
             <CheckBox x:Name="chkKeepInfoPansOverallSize" />
             <CheckBox x:Name="chkFilesOverwriteWarn" />
             <CheckBox x:Name="chkExtendedKinships" />
-
-            <CheckBox x:Name="chkExtendedLocations" />
-            <StackLayout Orientation="Horizontal" Spacing="20">
-              <StackLayoutItem />
-              <CheckBox x:Name="chkELAbbreviatedNames" />
-            </StackLayout>
-
-            <CheckBox x:Name="chkReversePlacesOrder" />
-
             <CheckBox x:Name="chkShowNumberOfSubstructures" />
           </StackLayout>
         </TabPage>
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
index bc8afb0a0..e02bf80bd 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
@@ -34,12 +34,6 @@
                                     <Label x:Name="lblLanguage" Grid.Column="0" Grid.Row="0" />
                                     <comcom:GKComboBox x:Name="cmbLanguages" Grid.Column="1" Grid.Row="0" />
 
-                                    <Label x:Name="lblGeocoder" Grid.Column="0" Grid.Row="1" />
-                                    <comcom:GKComboBox x:Name="cmbGeocoder" Grid.Column="1" Grid.Row="1" />
-
-                                    <Label x:Name="lblGeoSearchCountry" Grid.Column="0" Grid.Row="2" />
-                                    <comcom:GKComboBox x:Name="cmbGeoSearchCountry" Grid.Column="1" Grid.Row="2" />
-
                                     <Label x:Name="lblCertaintyAlgorithm" Grid.Column="0" Grid.Row="3" />
                                     <comcom:GKComboBox x:Name="cmbCertaintyAlgorithm" Grid.Column="1" Grid.Row="3" />
 
@@ -364,6 +358,28 @@
                                 </StackLayout>
                             </xp:TabItem>
 
+                            <xp:TabItem x:Name="pageGeo">
+                                <StackLayout Orientation="Vertical" Spacing="8">
+
+                                    <Grid ColumnSpacing="4" RowSpacing="4">
+                                        <Label x:Name="lblGeocoder" Grid.Column="0" Grid.Row="1" />
+                                        <comcom:GKComboBox x:Name="cmbGeocoder" Grid.Column="1" Grid.Row="1" />
+
+                                        <Label x:Name="lblGeoSearchCountry" Grid.Column="0" Grid.Row="2" />
+                                        <comcom:GKComboBox x:Name="cmbGeoSearchCountry" Grid.Column="1" Grid.Row="2" />
+                                    </Grid>
+
+                                    <input:CheckBox x:Name="chkExtendedLocations" />
+                                    <StackLayout Orientation="Horizontal" Spacing="20">
+                                        <Label HorizontalOptions="Start" Text="" />
+                                        <input:CheckBox x:Name="chkELAbbreviatedNames" />
+                                    </StackLayout>
+                                    <input:CheckBox x:Name="chkReversePlacesOrder" />
+                                    <input:CheckBox x:Name="chkSearchPlacesWithoutCoords" />
+
+                                </StackLayout>
+                            </xp:TabItem>
+
                         </xp:TabViewControl.ItemSource>
                     </xp:TabViewControl>
 
@@ -417,14 +433,6 @@
                         <input:CheckBox x:Name="chkFilesOverwriteWarn" />
                         <input:CheckBox x:Name="chkExtendedKinships" />
 
-                        <input:CheckBox x:Name="chkExtendedLocations" />
-                        <StackLayout Orientation="Horizontal" Spacing="20">
-                            <Label HorizontalOptions="Start" Text="" />
-                            <input:CheckBox x:Name="chkELAbbreviatedNames" />
-                        </StackLayout>
-
-                        <input:CheckBox x:Name="chkReversePlacesOrder" />
-
                         <input:CheckBox x:Name="chkShowNumberOfSubstructures" />
 
                         <Label VerticalOptions="FillAndExpand" />