Improve XLS export