Minor updates to fix duplicate note displayed on selection screen.