Search fixes and cleanup