Added query modifications