Better handling of adresslines like '90 route de Frontenex', 'Via San Salvatore, 2'