1153 Improved countries query