Inconsistent handling of "primary" contact in interface (javascript issue and showHide problem)

Two issues w/ Edit Contact form:

1. If the 2nd location is checked as primary, and then you go to re-check the first location - you should get the same Jscript dialog (confirming the change of primary) AND the checkboxes s/b swapped. Current this only works when setting the 2nd location to be primary (see dan robinson's details below).

2. The showHide logic in the underlying php files (Edit.php and related mods) needs to be fixed so that any block that has an error in it is ALWAYS expanded. Currently, you can get validation errors on submit that refer to location blocks and or email, phone, im instances that are "hidden" when the form is re-loaded.

— original post from dan robinson ----
When editing a contact and selecting an "additional" address as the "primary" the user gets a dialog box asking to confirm their choice. If they confirm the 1st address is "unchecked" as being "primary" and the additional address is not listed as "primary" - all is good.

However, the reverse is not true. You can now "re-check" the first address as "primary" and not be challenged with a dialog. When you try to save it does pop an error - however it is confusing as the "additional" address is now "hidden" by the java script "contracted" edit area.