Fix PGSearch to use city_id