Fixed searching old data