Fix up search.
Better(?) pre-buffer library handling.