add some validation and add the filters