omits country for Singapore addresses
Merge branch 'feature/fixing-singaporean-addresses' into develop