Fix error finding state/zip code fields

The state and ZIP code fields in the second form are auto-filled from the initial validating form, so presumably we don't need them in the second.
Merge pull request #702 from mandarg/patch-2

Second pass at #48