Changed OrganizationContextQueryHandler to OrganizationQueryHandler since query needs handled synchronously and references to HttpContext cause deadlocks
Changed BaseController.OrganizationContext to GetOrganizationContext and to use query handler