@clong I think we need a run-immediately tag in the query definition to handle your use-case