Added join location and city table