Add unique key constraint for data tables
Replace named entity, ndash, with numeric entity