COMMONS-190: Fixed bugs for rendering task and event