Search pages and other cleanups