diff --git a/components/lazmapviewer/examples/fulldemo/MapViewer_Demo.lpi b/components/lazmapviewer/examples/fulldemo/MapViewer_Demo.lpi
index ea55ffa3a..503b9d767 100644
--- a/components/lazmapviewer/examples/fulldemo/MapViewer_Demo.lpi
+++ b/components/lazmapviewer/examples/fulldemo/MapViewer_Demo.lpi
@@ -77,6 +77,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/lazmapviewer/examples/fulldemo/main.lfm b/components/lazmapviewer/examples/fulldemo/main.lfm
index 3a826c538..d8cf53276 100644
--- a/components/lazmapviewer/examples/fulldemo/main.lfm
+++ b/components/lazmapviewer/examples/fulldemo/main.lfm
@@ -26,7 +26,6 @@ object MainForm: TMainForm
     Font.Color = clBlack
     MapProvider = 'OpenStreetMap Mapnik'
     POIImages = POIImages
-    POIImagesWidth = 0
     UseThreads = True
     ZoomToCursor = False
     OnZoomChange = MapViewZoomChange
@@ -40,9 +39,9 @@ object MainForm: TMainForm
     Height = 640
     Top = 0
     Width = 275
-    ActivePage = PgConfig
+    ActivePage = PgData
     Align = alRight
-    TabIndex = 1
+    TabIndex = 0
     TabOrder = 1
     object PgData: TTabSheet
       Caption = 'Data'
diff --git a/components/lazmapviewer/source/mvgeonames.pas b/components/lazmapviewer/source/mvgeonames.pas
index 6f2b926f6..1ec4e8518 100644
--- a/components/lazmapviewer/source/mvgeonames.pas
+++ b/components/lazmapviewer/source/mvgeonames.pas
@@ -68,21 +68,6 @@ const
   SEARCH_URL = 'http://geonames.org/search.html?q=%s'; //&country=%s';
 
 
-function CleanLocationName(x: string): string;
-var
-  i: Integer;
-begin
-  Result := '';
-  for i := 1 to Length(x) do
-  begin
-    if x[i] in ['A'..'Z', 'a'..'z', '0'..'9'] then
-      Result := Result + x[i]
-    else
-      Result := Result + '+'
-  end;
-end;
-
-
 { TMVGeoNames }
 
 procedure TMvGeoNames.FoundTagHandler(NoCaseTag, ActualTag: String);
@@ -219,7 +204,7 @@ begin
   FLocationName := ALocationName;
   ms := TMemoryStream.Create;
   try
-    url := Format(SEARCH_URL, [CleanLocationName(FLocationName)]);
+    url := Format(SEARCH_URL, [FLocationName]);
     ADownloadEngine.DownloadFile(url, ms);
     ms.Position := 0;
     SetLength(s, ms.Size);