excel download fixes, #21937, #20337, etc.