improved address search