update added support for address location types
update added check for is primary