Improved export filter tool