Fix to countries query