Added filtering+validation for forms