diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Incidents.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Incidents.json
index 0e81228aa072..0098a0ab8407 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Incidents.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Incidents.json
@@ -63,16 +63,16 @@
             "$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -422,16 +422,16 @@
             "$ref": "#/parameters/IncidentId"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -692,16 +692,16 @@
             "$ref": "#/parameters/IncidentId"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -4174,39 +4174,6 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "ODataFilter": {
-      "description": "Filters the results, based on a Boolean condition. Optional.",
-      "in": "query",
-      "name": "$filter",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataOrderBy": {
-      "description": "Sorts the results. Optional.",
-      "in": "query",
-      "name": "$orderby",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataSkipToken": {
-      "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
-      "in": "query",
-      "name": "$skipToken",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataTop": {
-      "description": "Returns only the first n results. Optional.",
-      "format": "int32",
-      "in": "query",
-      "name": "$top",
-      "required": false,
-      "type": "integer",
-      "x-ms-parameter-location": "method"
-    },
     "Relation": {
       "name": "relation",
       "in": "body",
diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Metadata.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Metadata.json
index a00f7dae9334..b9779463df25 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Metadata.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Metadata.json
@@ -66,16 +66,16 @@
             "$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkip"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkip"
           }
         ],
         "responses": {
@@ -737,40 +737,6 @@
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
-    },
-    "ODataFilter": {
-      "description": "Filters the results, based on a Boolean condition. Optional.",
-      "in": "query",
-      "name": "$filter",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataOrderBy": {
-      "description": "Sorts the results. Optional.",
-      "in": "query",
-      "name": "$orderby",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataSkip": {
-      "description": "Used to skip n elements in the OData query (offset). Returns a nextLink to the next page of results if there are any left.",
-      "in": "query",
-      "name": "$skip",
-      "required": false,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataTop": {
-      "description": "Returns only the first n results. Optional.",
-      "in": "query",
-      "name": "$top",
-      "required": false,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
     }
   }
 }
diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Incidents.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Incidents.json
index 17389e311dfb..a44760474b59 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Incidents.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Incidents.json
@@ -60,16 +60,16 @@
             "$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -350,16 +350,16 @@
             "$ref": "#/parameters/IncidentId"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -605,16 +605,16 @@
             "$ref": "#/parameters/IncidentId"
           },
           {
-            "$ref": "#/parameters/ODataFilter"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
           },
           {
-            "$ref": "#/parameters/ODataOrderBy"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
           },
           {
-            "$ref": "#/parameters/ODataTop"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -3792,39 +3792,6 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "ODataFilter": {
-      "description": "Filters the results, based on a Boolean condition. Optional.",
-      "in": "query",
-      "name": "$filter",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataOrderBy": {
-      "description": "Sorts the results. Optional.",
-      "in": "query",
-      "name": "$orderby",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataSkipToken": {
-      "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
-      "in": "query",
-      "name": "$skipToken",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "ODataTop": {
-      "description": "Returns only the first n results. Optional.",
-      "format": "int32",
-      "in": "query",
-      "name": "$top",
-      "required": false,
-      "type": "integer",
-      "x-ms-parameter-location": "method"
-    },
     "Relation": {
       "name": "relation",
       "in": "body",
diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Watchlists.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Watchlists.json
index 656845335557..1ad2edd299e7 100644
--- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Watchlists.json
+++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Watchlists.json
@@ -63,7 +63,7 @@
             "$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -269,7 +269,7 @@
             "$ref": "#/parameters/WatchlistAlias"
           },
           {
-            "$ref": "#/parameters/ODataSkipToken"
+            "$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
           }
         ],
         "responses": {
@@ -761,14 +761,6 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "ODataSkipToken": {
-      "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
-      "in": "query",
-      "name": "$skipToken",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
     "SubscriptionId": {
       "description": "Azure subscription ID",
       "in": "path",
diff --git a/specification/securityinsights/resource-manager/common/1.0/types.json b/specification/securityinsights/resource-manager/common/1.0/types.json
index 4e712cd71340..5e0826d07a40 100644
--- a/specification/securityinsights/resource-manager/common/1.0/types.json
+++ b/specification/securityinsights/resource-manager/common/1.0/types.json
@@ -95,6 +95,48 @@
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
+    },
+    "ODataFilter": {
+      "description": "Filters the results, based on a Boolean condition. Optional.",
+      "in": "query",
+      "name": "$filter",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "ODataOrderBy": {
+      "description": "Sorts the results. Optional.",
+      "in": "query",
+      "name": "$orderby",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "ODataSkipToken": {
+      "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
+      "in": "query",
+      "name": "$skipToken",
+      "required": false,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "ODataTop": {
+      "description": "Returns only the first n results. Optional.",
+      "format": "int32",
+      "in": "query",
+      "name": "$top",
+      "required": false,
+      "type": "integer",
+      "x-ms-parameter-location": "method"
+    },
+    "ODataSkip": {
+      "description": "Used to skip n elements in the OData query (offset). Returns a nextLink to the next page of results if there are any left.",
+      "in": "query",
+      "name": "$skip",
+      "required": false,
+      "type": "integer",
+      "format": "int32",
+      "x-ms-parameter-location": "method"
     }
   }
 }