Slight refactoring of search plugin creation, still thinking on
classnames