Ensure masking applied to scrubbed params/values is consistent for form/...

...json. If the form values use the length of the value for masking it's easy to determine which value was selected.