Add more filters when generating reports