Changed query to always respect the orgID context