Fixed searching errors