Adds searching across all searchable types

And uses less code. How ‘bout that?