Map search bug

Fix for the map search bug (Issue #471)