added filtering to reports
user-defined filter takes precedence over non-null filter