Indent correctly
Use special search phrase instead of name.
Use explicit amount of meters to widen the search box.
Add mapping from osm key:value to special search phrase.