Improve trace functionality
Only trace when --trace is present
Add field split filters