More searchability - need to move to Concern.  Update to scopes/methods to allow filtering by orgs