xls form export fixes