added search by city and city disambiguation