diff --git a/main/gui_search.c b/main/gui_search.c
index f61c081..8f3deb3 100644
--- a/main/gui_search.c
+++ b/main/gui_search.c
@@ -53,7 +53,7 @@ void gui_search_show () {
 	if (wsearch.screen == NULL) gui_window_new (&wsearch, 220, 260, _("Search.."));
 	wsearch.screen_changed = 1;
 	wsearch.style = WGUI_S_VCENTER | WGUI_S_HCENTER;
-	wsearch.title[0] = 0;
+	strncpy (wsearch.title, _("Search"), GUI_TEXTLEN);
 
     /* Name Ok Button */
     if (ws_labelname == NULL) ws_labelname = gui_label_new (_("City:"), 5, 10);
@@ -94,8 +94,7 @@ void gui_search_close () {
 void gui_search_city () {
 	int i;
 
-	char text[] = "gui_search_city";
-	search_data_cnt = map_search (text, search_data, SEARCH_MAXRESULT);
+	search_data_cnt = map_search (GUI_ENTRY_T(ws_entryname)->text, search_data, SEARCH_MAXRESULT);
 	for (i = 0; i < search_data_cnt; i++)
 		d_printf ("  %-3d:%s",i , search_data->name[i]);
 };