-- fixed some validation and filters