DRMP: Use LocationSelector2 for Offices (added support for Street Address
& no Map)