Fix ID and searching