XD-1162 Adding check for existing value with underscore column name