Replaced the two corss street fields with one address field