refactor(query): combine short-query and page-aware execution

refactor(query): combine short-query and page-aware execution #51642