Added exclusion of hidden fields.