Add filter to CSV export filename

Fixes issue #2360