AI-406 - fixed column mapping