fixes #1952
Merge branch 'subscription-queries'