Make submethod validation actually work!

We used to only check 'address' stuff because it was first
in the list; this will now check all fields.

I'm not sure how long this was broken nor what fixing it is
going to break on the live site... eep!

Change-Id: If543248d024d438fbe4598315deb6fe5b107bb20