Corrected some errors

@@ -179,12 +179,6 @@
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :ActivityRiskFactor ;
-      owl:onProperty :hasRisk ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ActivityRiskFactor ;
       owl:onProperty :hasRiskFactorForPlan ;
     ] ;
   rdfs:subClassOf [
@@ -808,7 +802,7 @@
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       :shouldUseRef "true"^^xsd:boolean ;
-      owl:onClass :Activity ;
+      owl:onClass :ActivityInPlan ;
       owl:onProperty :hasSuccessorActivity ;
       owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
     ] ;
@@ -1953,6 +1947,27 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
+      :shouldUseAnyUri "true"^^xsd:boolean ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :Organization ;
+      owl:onProperty :hasMainContractor ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      :shouldUseAnyUri "true"^^xsd:boolean ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :Organization ;
+      owl:onProperty :hasOperator ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      :shouldUseAnyUri "true"^^xsd:boolean ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :Organization ;
+      owl:onProperty :hasSubContractor ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onClass userfield:SourceSpecifiedUserField ;
       owl:onProperty :hasSpecifiedUserField ;
@@ -2002,24 +2017,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Organization ;
-      owl:onProperty :hasMainContractor ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Organization ;
-      owl:onProperty :hasOperator ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Organization ;
-      owl:onProperty :hasSubContractor ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :PlanForILAP ;
       owl:onProperty :hasPlan ;
     ] ;