corrected switch option city and addition of housenumber

the geocode field was missing the correct housnumber field and the city
list was not added correctly.