Would it make sense to consolidate the two find_organization filters in to one?