Added query comments