Re-add address search
Merge pull request #362 from LocalData/address-search

Re-add address search