Improvements to search/address