rearranging search prototypes to allow for more orgs