Enable per URL/site 2FA association for credentials that utilize SSO for different places

Periodically my SSO credentials to login to various client systems must be updated and this set of credentials may be used for several internal and third-party service accounts managed by the business.

After my SSO is updated, all the different site specific 1password autofill suggestions are outdated until I manually update them to match my changed password.

In some cases the specific site service may use their OWN 2FA after the SSO login has accepted/confirmed the username and password (and maybe SSO's MFA). AWS is a very specific case of this where I log in with my SSO and then I'm prompted for the AWS MFA, NOT the SSO MFA.

Will there ever be a way in 1password to somehow enable per URL/site 2FA association for credentials that utilize SSO for different sites? This is further exacerbated when I have multiple different AWS tenants to login to that use the same SSO but also have different MFA "secrets" from each other.

Similar request but with a concrete example of why linking multiple "Items" to a single username/password without adding a bunch of URLs to a single entry may be another implementation option.

https://1password.community/discussion/139219/

1Password Version: Not Provided
Extension Version: Not Provided
OS Version: Not Provided
Browser: Not Provided