issue #22394: write context queries directly against underlying table
Merge pull request #1194 from shackbarth/22394

issue #22394: write context queries directly against underlying table