Be smarter about excluding hidden fields.