fix normalized entity keys.