Fixing issues with field choices mapping and adding new mapping