Fixed searching issues