add location_id condition to villa search query
fix options_for_select values