Autofill not filling correct password value for selected item

Updated to 8.7.1 and it has the same behavior.

Turns out, my selected choice in 1P's pop-up dialog is an older item from a vault of imported Safari passwords and not my latest entry from my primary vault which shows up lower in the list of choices. It appears that 1P v7 was either 1) only offering matches from my primary vault, or 2) prioritizing the results so that the primary vault items were at the top of the list? Either way, I never seem to have run into this with v7 but v8 behaves differently.

I used to designate a primary vault plus I kept a couple of other vaults to archive old items, but version 8 uses collections and a single "Archive" in the sidebar, so I guess I just need to learn some new tricks for v8 :/