Fixed TVs and modified schema for registry where PK had two keys