DATAGRAPH-487 - Handle unique fields that have to be converted correctly