Feature/control import fixes

Mappings should work correctly for mapping columns on control export now.