rewrote the query relying on NEST conditionless construct

Pretty much untested so pull with care! :)