Personal Address Update: US Employees sees 2 options for a zip code

After redwood there has been a change in behaviour of Personal Address Update form.

For US Address when a colleague tries to add/update his address in Classic page when he enter zip code he see a single option of City/County/State.

He selects this option and the state is stored as a 2 digit code in DB and the State DBI’s pull it as is.

After redwood he sees 2 combinations as below:

The issue is when employee selects the 2nd option with Full State Name. The interface sends the full name to downstream and there it fails.

Is there a way to restrict this back just 1 option, the state code one.