Country query bug resolved