Added id fields for countries/resorts
Merged searches_controller