feat: Also normalize product rentiy references;