Fixed minor problems with searching