- better filtering
- better error handler