searh and city.js modified