Excel Export and Excel Zipped Export fixed