Fixed search when exporting