critical non-selective query fix for large orgs

# Warning
# Info
* Resolves the issue where organizations with 200,000+ contacts would get a non-selective query error trying to save new contacts with addresses.

# Issues
Fixes #1225