Fix country popup