partial query enclosing support