further clean up search