XLS export & settings fix