More validation and filtering