WIP improving Action query access security