#1042 Widget usages: using originalId instead of widget id