Merge "Fix bug with corresponding entry finder." into main