added country list and changed query