Add or Edit Contact: Show and Hide Arrays are not set properly after submit with error or duplicate check

If the Add or Edit Contact (Ind, HH or Org) form is submitted AND there is a validation error...
OR
the 'Check for Matching Contacts' button is clicked...

when the form redisplays, ALL form elements are displayed (e.g. all 3 locations, all avail phone and email inputs, etc.). The correct behavior is that only fields w/ data and fields that have a validation error should be set to 'show'.