Fixed some more search bugs