new stuff for search cleanup