Fixed searching issue