Disable service access proprly queries for organization.

[Finishes #80867298]

Signed-off-by: Dan Lavine <dlavine@us.ibm.com>