simplify filters and error handling