WIP: Query guidance

Addressing issue #1393