Need to switch the position of the zip-code and the location