Few more bugs with filter fixed.  Added ability to export to CSV