add functionality to search by cvd and city also