CS-4571: Address search for maps
* adjusting