Fixed the duplicate item registry - mostly