wip - decoupling query
wip - working retro-compatible decoupled Query