refactor village and country table IDs into vars, add test of query chande on country click