CMS-2857 Make component rendering work with Content Id