Fixing issues with export columns