Continue query submission refactor