more fixes for search and address