remove @location.city references because they cause errors