EntitleRI: Update best guess selector