Use consistent query access