diff --git a/Makefile b/Makefile
index fc1c274..b012c2b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ sposmedit:
 	do if ! make -C $$i; then \
 		exit -2; \
 	fi done
-	$(CC) -o sposmedit -lm -lmain -lncurses -lmapsys -lbase -lmain -Lbase -Lmapsys -Lmain `pkg-config --libs libxml-2.0` -lbz2 -ggdb -pg $(DEBUG)
+	$(CC) -o sposmedit -lm -lmain -lncurses -lmapsys -lbase -lmain -Lbase -Lmapsys -Lmain `pkg-config --libs libxml-2.0` -lbz2 -lm -ggdb -pg $(DEBUG)
 
 cleanapp:
 	rm -rf sposmedit
@@ -39,7 +39,7 @@ sposmroutegl:
 	do if ! make -C $$i; then \
 		exit -2; \
 	fi done
-	$(CC) -o sposmroute -lsdlgl -lm -lmain -lgui -lmain -lmapsys -ldraw -lsdlgl -lbase -lmain -Lbase -Lmain -Lsdlgl -Ldraw -Lgui -Lmapsys -lbz2 $(DEBUG) `sdl-config --libs` `pkg-config --libs freetype2 libpng` -lm -lGL -lGLU -L/usr/X11R6/lib -L/usr/lib 
+	$(CC) -o sposmroute -lsdlgl -lm -lmain -lgui -lmain -lmapsys -ldraw -lsdlgl -lbase -lmain -Lbase -Lmain -Lsdlgl -Ldraw -Lgui -Lmapsys -lbz2 $(DEBUG) -lm `sdl-config --libs` `pkg-config --libs freetype2 libpng` -lm -lGL -lGLU -L/usr/X11R6/lib -L/usr/lib 
 cleanapp:
 	rm -rf sposmroutegl
 endif
diff --git a/mapsys/map_osmload.c b/mapsys/map_osmload.c
index 4437714..672921f 100644
--- a/mapsys/map_osmload.c
+++ b/mapsys/map_osmload.c
@@ -120,7 +120,9 @@ struct s_osm_xmlcallback {
 	long long int filepos;
 };
 
-#define OSM_HASHNODES 128
+//
+// number of Hashnodes to keep in memory
+#define OSM_HASHNODES 64
 
 static struct s_osm_hashnodes _hashnodes[OSM_HASHNODES];
 static struct s_osm_hashnodes *hashnodes[OSM_HASHNODES];
diff --git a/mapsys/map_searchhash.c b/mapsys/map_searchhash.c
index f6fb7b3..e2c8b53 100644
--- a/mapsys/map_searchhash.c
+++ b/mapsys/map_searchhash.c
@@ -116,10 +116,11 @@ void map_search_add (char *country, char *name, unsigned long long int id, float
 		/* copy country */
 		cp = dataline;
 
-		strncpy (cp, n, MAP_SEARCHLINE_LEN-(cp-dataline));
+		strncpy (cp, n, MAP_SEARCHLINE_LEN-(cp-dataline)-3);
 		cp = cp + strlen (cp); cp[0] = 0; cp++;
 
-		strncpy (cp, c, MAP_SEARCHLINE_LEN-(cp-dataline));
+        
+		strncpy (cp, c, MAP_SEARCHLINE_LEN-(cp-dataline)-2);
 		cp = cp + strlen (cp); cp[0] = 0; cp++;
 
 		snprintf (cp, MAP_SEARCHLINE_LEN-(cp-dataline), "%lld %f %f\n", id, lon, lat);