Fix address search