diff --git a/samples/charts/category-chart/column-chart-multiple-sources.json b/samples/charts/category-chart/column-chart-multiple-sources.json
index cfffcbc9..f18440b4 100644
--- a/samples/charts/category-chart/column-chart-multiple-sources.json
+++ b/samples/charts/category-chart/column-chart-multiple-sources.json
@@ -22,7 +22,7 @@
       "yAxisLabelLeftMargin": 0,
       "isHorizontalZoomEnabled": false,
       "isVerticalZoomEnabled": false,
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "crosshairsDisplayMode": "None"
     }
   },
diff --git a/samples/charts/category-chart/column-chart-single-source.json b/samples/charts/category-chart/column-chart-single-source.json
index b46acc4d..7dd90725 100644
--- a/samples/charts/category-chart/column-chart-single-source.json
+++ b/samples/charts/category-chart/column-chart-single-source.json
@@ -15,7 +15,7 @@
       "yAxisLabelLeftMargin": 0,
       "isHorizontalZoomEnabled": false,
       "isVerticalZoomEnabled": false,
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "highlightingMode": "FadeOthersSpecific",
       "highlightingBehavior": "NearestItemsAndSeries",
       "crosshairsDisplayMode": "None"
diff --git a/samples/charts/category-chart/column-chart-styling.json b/samples/charts/category-chart/column-chart-styling.json
index f052348d..ea53fde0 100644
--- a/samples/charts/category-chart/column-chart-styling.json
+++ b/samples/charts/category-chart/column-chart-styling.json
@@ -26,7 +26,7 @@
       "xAxisGap": 0.5,
 
       "crosshairsDisplayMode": "None",
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "highlightingMode": "FadeOthersSpecific",
       "highlightingBehavior": "NearestItemsAndSeries"
     }
diff --git a/samples/charts/category-chart/data-tooltip-formatting-decimals.json b/samples/charts/category-chart/data-tooltip-formatting-decimals.json
index 003d1bcf..b50d6637 100644
--- a/samples/charts/category-chart/data-tooltip-formatting-decimals.json
+++ b/samples/charts/category-chart/data-tooltip-formatting-decimals.json
@@ -18,7 +18,7 @@
       "yAxisTitleLeftMargin": 10,
       "yAxisTitleRightMargin": 5,
       "yAxisLabelLeftMargin": 0,
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "crosshairsDisplayMode": "None",
       "highlightingMode": "FadeOthersSpecific",
       "highlightingBehavior": "NearestItemsAndSeries"
diff --git a/samples/charts/category-chart/step-area-multiple-sources.json b/samples/charts/category-chart/step-area-multiple-sources.json
index 2e193b1a..49ea2d4b 100644
--- a/samples/charts/category-chart/step-area-multiple-sources.json
+++ b/samples/charts/category-chart/step-area-multiple-sources.json
@@ -19,7 +19,7 @@
       "titleLeftMargin": 25,
       "titleTopMargin": 10,
       "titleBottomMargin": 10,
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "isSeriesHighlightingEnabled": true,
       "isTransitionInEnabled": true,
       "isHorizontalZoomEnabled": false,
diff --git a/samples/charts/category-chart/step-area-styling.json b/samples/charts/category-chart/step-area-styling.json
index b3ff72c0..fef79a50 100644
--- a/samples/charts/category-chart/step-area-styling.json
+++ b/samples/charts/category-chart/step-area-styling.json
@@ -17,7 +17,7 @@
       "name": "chart",
       "chartType": "StepArea",
       "yAxisTitle": "TWh",
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "isSeriesHighlightingEnabled": true,
       "isTransitionInEnabled": true,
       "isHorizontalZoomEnabled": false,
diff --git a/samples/charts/category-chart/step-line-multiple-sources.json b/samples/charts/category-chart/step-line-multiple-sources.json
index 7c125223..14ad3e14 100644
--- a/samples/charts/category-chart/step-line-multiple-sources.json
+++ b/samples/charts/category-chart/step-line-multiple-sources.json
@@ -16,7 +16,7 @@
       "chartType": "StepLine",
       "dataSourceRef": "CountryRenewableElectricity",
       "includedProperties": [ "Year", "Europe", "China", "America" ],
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "isSeriesHighlightingEnabled": true,
       "isHorizontalZoomEnabled": false,
       "isVerticalZoomEnabled": false,
diff --git a/samples/charts/category-chart/step-line-single-source.json b/samples/charts/category-chart/step-line-single-source.json
index 05cfc939..ad6b2c37 100644
--- a/samples/charts/category-chart/step-line-single-source.json
+++ b/samples/charts/category-chart/step-line-single-source.json
@@ -13,7 +13,7 @@
       "isHorizontalZoomEnabled": false,
       "isVerticalZoomEnabled": false,
       "yAxisTitle": "TWh",
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "crosshairsSnapToData": true
     }
   },
diff --git a/samples/charts/category-chart/step-line-styling.json b/samples/charts/category-chart/step-line-styling.json
index cbe1da8d..3ae53b6f 100644
--- a/samples/charts/category-chart/step-line-styling.json
+++ b/samples/charts/category-chart/step-line-styling.json
@@ -16,7 +16,7 @@
       "chartType": "StepLine",
       "dataSourceRef": "CountryRenewableElectricity",
       "includedProperties": [ "Year", "Europe", "China", "America" ],
-      "isCategoryHighlightingEnabled": true,
+      "isCategoryHighlightingEnabled": false,
       "isSeriesHighlightingEnabled": true,
       "isHorizontalZoomEnabled": false,
       "isVerticalZoomEnabled": false,
diff --git a/samples/charts/data-chart/category-line-chart.json b/samples/charts/data-chart/category-line-chart.json
index 6d174ecd..e08dc0d9 100644
--- a/samples/charts/data-chart/category-line-chart.json
+++ b/samples/charts/data-chart/category-line-chart.json
@@ -21,31 +21,21 @@
       ],
       "plotAreaBackground": "rgba(255,255,255,1)",
       "series": [
+
         {
-          "type": "LineSeries",
-          "name": "lineSeries1",
-          "title": "Europe",
-          "xAxisRef": "xAxis",
-          "yAxisRef": "yAxis",
-          "markerType": "Circle",
-          "dataSourceRef": "CountryRenewableElectricity",
-          "valueMemberPath": "Europe",
-          "showDefaultTooltip": true
-        },
-        {
-          "type": "LineSeries",
+          "type": "ColumnSeries",
           "name": "LineSeries2",
-          "title": "China",
+          "title": "Russia",
           "xAxisRef": "xAxis",
           "yAxisRef": "yAxis",
           "markerType": "Circle",
           "dataSourceRef": "CountryRenewableElectricity",
-          "valueMemberPath": "China",
+          "valueMemberPath": "Russia",
           "showDefaultTooltip": true
         },
         {
-          "type": "LineSeries",
-          "name": "LineSeries3",
+          "type": "ColumnSeries",
+          "name": "ColumnSeries3",
           "title": "America",
           "xAxisRef": "xAxis",
           "yAxisRef": "yAxis",