Make number separate from street for US addresses, allow multi-line streets