Display queries properly in UHN implementation