Switch to use routeParam organizationId