Major updates to properly support address search.