WH-36 - Improvements in form validation and value filtering