Simple query can do lag check as well

Split logic apart so that simple query can be configured for both use
cases