Also support first-run queries...