Added query handler for getting OrganizationContext