Do not add 'null' to address when only city is recognized #585
Flush every map whenever a partner is selected #294