REFACTOR Addresss Search