diff --git a/samples/grids/grid/finjs/App.razor b/samples/grids/grid/finjs/App.razor
index 5cf30b1a2..04a13eb7e 100644
--- a/samples/grids/grid/finjs/App.razor
+++ b/samples/grids/grid/finjs/App.razor
@@ -33,16 +33,16 @@
     <div class="container vertical fill">
 
         <IgbGrid Class="gridSize" 
-                 AutoGenerate="false"
-                 RowSelection="GridSelectionMode.Multiple"
-                 PrimaryKey="id"
-                 AllowFiltering="true"
-                 FilterMode="FilterMode.ExcelStyleFilter"
-                 HideGroupedColumns=true
-                 CellClick="OnCellClick"
-                 Name="grid1"
-                 Id="grid1"
-                 @ref="grid1">
+        AutoGenerate="false"
+        RowSelection="GridSelectionMode.Multiple"
+        PrimaryKey="id"
+        AllowFiltering="true"
+        FilterMode="FilterMode.ExcelStyleFilter"
+        HideGroupedColumns=true
+        CellClick="OnCellClick"
+        Name="grid1"
+        Id="grid1"
+        @ref="grid1">
             <IgbGridToolbar>
                 <IgbGridToolbarActions>
                     <IgbGridToolbarHiding></IgbGridToolbarHiding>
@@ -51,7 +51,7 @@
                 </IgbGridToolbarActions>
             </IgbGridToolbar>
 
-           @*<IgbColumn Field="id"
+            @*<IgbColumn Field="id"
                        Header="id"
                        DataType="GridColumnDataType.Number"
                        Sortable="true"
@@ -60,38 +60,38 @@
             </IgbColumn>*@
 
             <IgbColumn Field="category"
-                       Header="Category"
-                       Width="120px"
-                       DataType="GridColumnDataType.String"
-                       Sortable="true"
-                       Editable="true"
-                       Resizable="true">
+            Header="Category"
+            Width="120px"
+            DataType="GridColumnDataType.String"
+            Sortable="true"
+            Editable="true"
+            Resizable="true">
             </IgbColumn>
 
             <IgbColumn Field="type"
-                       Header="Type"
-                       Width="100px"
-                       DataType="GridColumnDataType.String"
-                       Sortable="true"
-                       Editable="true"
-                       Resizable="true">
+            Header="Type"
+            Width="100px"
+            DataType="GridColumnDataType.String"
+            Sortable="true"
+            Editable="true"
+            Resizable="true">
             </IgbColumn>
 
             <IgbColumn Field="contract"
-                       Header="Contract"
-                       Width="110px"
-                       DataType="GridColumnDataType.String"
-                       Sortable="true"
-                       Groupable="true"
-                       Editable="true">
+            Header="Contract"
+            Width="110px"
+            DataType="GridColumnDataType.String"
+            Sortable="true"
+            Groupable="true"
+            Editable="true">
             </IgbColumn>
 
             <IgbColumn Field="country"
-                       Width="100px"
-                       Header="Country"
-                       DataType="GridColumnDataType.String"
-                       Sortable="true"
-                       Editable="true">
+            Width="100px"
+            Header="Country"
+            DataType="GridColumnDataType.String"
+            Sortable="true"
+            Editable="true">
             </IgbColumn>
 
             @*<IgbColumn Field="region"
@@ -103,241 +103,241 @@
             </IgbColumn>*@            
 
             <IgbColumn Field="open"
-                       Width="100px"
-                       Header="Open"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true"
-                       Editable="true">
+            Width="100px"
+            Header="Open"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true"
+            Editable="true">
             </IgbColumn>
 
             <IgbColumn Field="price"
-                       Width="100px"
-                       Header="Price"
-                       BodyTemplateScript="PriceTemplate"
-                       CellClassesScript="trends"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true"
-                       Editable="true">
+            Width="100px"
+            Header="Price"
+            BodyTemplateScript="PriceTemplate"
+            CellClassesScript="trends"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true"
+            Editable="true">
             </IgbColumn>
 
 
             <IgbColumn Field="Chart"
-                       BodyTemplate="ChartButtonTemplate"
-                       Width="100px"
-                       Header="Chart">
+            BodyTemplate="ChartButtonTemplate"
+            Width="100px"
+            Header="Chart">
             </IgbColumn>
 
             <IgbColumn Field="change"
-                       Width="120px"
-                       Header="Change"
-                       CellClassesScript="trendsChange"
-                       DataType="GridColumnDataType.Number"
-                       Sortable="true"
-                       Filterable="true"
-                       Editable="true">
+            Width="120px"
+            Header="Change"
+            CellClassesScript="trendsChange"
+            DataType="GridColumnDataType.Number"
+            Sortable="true"
+            Filterable="true"
+            Editable="true">
             </IgbColumn>
 
             <IgbColumn Field="changeP"
-                       CellClassesScript="trendsChange"
-                       Width="120px"
-                       Header="Change %"
-                       DataType="GridColumnDataType.Percent"
-                       Sortable="true"
-                       Filterable="true"
-                       Editable="true">
+            CellClassesScript="trendsChange"
+            Width="120px"
+            Header="Change %"
+            DataType="GridColumnDataType.Percent"
+            Sortable="true"
+            Filterable="true"
+            Editable="true">
             </IgbColumn>
 
             <IgbColumn Field="buy"
-                       Width="110px"
-                       Header="Buy"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            Header="Buy"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
 
             <IgbColumn Field="sell"
-                       Width="110px"
-                       Header="Sell"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            Header="Sell"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
 
             <IgbColumn Field="spread"
-                       Width="110px"
-                       Header="Spread"
-                       DataType="GridColumnDataType.Number"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            Header="Spread"
+            DataType="GridColumnDataType.Number"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
 
             <IgbColumn Field="volume"
-                       Width="110px"
-                       Header="Volume"
-                       DataType="GridColumnDataType.Number"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            Header="Volume"
+            DataType="GridColumnDataType.Number"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
-            
+
             <IgbColumn Field="settlement"
-                       Width="100px"
-                       Header="Settlement"
-                       DataType="GridColumnDataType.String"
-                       Sortable="true"
-                       Editable="true"
-                       Resizable="true">
+            Width="100px"
+            Header="Settlement"
+            DataType="GridColumnDataType.String"
+            Sortable="true"
+            Editable="true"
+            Resizable="true">
             </IgbColumn>
 
             <IgbColumn Field="lastUpdated"
-                       Width="120px"
-                       Header="Last Updated"
-                       DataType="GridColumnDataType.Date"
-                       Sortable="true"
-                       Filterable="true"
-                       Editable="true">
+            Width="120px"
+            Header="Last Updated"
+            DataType="GridColumnDataType.Date"
+            Sortable="true"
+            Filterable="true"
+            Editable="true">
             </IgbColumn>
 
             <IgbColumn Field="high"
-                       Width="110px"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
             <IgbColumn Field="low"
-                       Width="110px"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
             <IgbColumn Field="annaulHigh"
-                       Width="110px"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
             <IgbColumn Field="annaulLow"
-                       Width="110px"
-                       DataType="GridColumnDataType.Currency"
-                       Sortable="true"
-                       Filterable="true">
+            Width="110px"
+            DataType="GridColumnDataType.Currency"
+            Sortable="true"
+            Filterable="true">
             </IgbColumn>
             <IgbColumn Field="indGrou"
-                       Width="110px"
-                       Filterable="false">
+            Width="110px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="indSect"
-                       Width="100px"
-                       Filterable="false">
+            Width="100px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="indSubg"
-                       Width="100px"
-                       Filterable="false">
+            Width="100px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="secType"
-                       Width="90px"
-                       Filterable="false">
+            Width="90px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="issuerN"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="moodys"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="fitch"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="dbrs"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="collatT"
-                       Width="90px"
-                       Filterable="false">
+            Width="90px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="curncy"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="security"
-                       Width="120px"
-                       Filterable="false">
+            Width="120px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="sector"
-                       Width="80px"
-                       Filterable="false">
+            Width="80px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="cusip"
-                       Width="100px"
-                       Filterable="false">
+            Width="100px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="ticker"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="cpn"
-                       Width="80px"
-                       Filterable="false">
+            Width="80px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="maturity"
-                       Width="120px"
-                       Filterable="false">
+            Width="120px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="krD_3YR"
-                       Width="110px"
-                       Filterable="false">
+            Width="110px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="zV_SPREAD"
-                       Width="90px"
-                       Filterable="false">
+            Width="90px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="kRD_5YR"
-                       Width="50px"
-                       Filterable="false">
+            Width="50px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="kRD_1YR"
-                       Width="80px"
-                       Filterable="false">
+            Width="80px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="indGrou"
-                       Width="110px"
-                       Filterable="false">
+            Width="110px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="indSect"
-                       Width="100px"
-                       Filterable="false">
+            Width="100px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="indSubg"
-                       Width="100px"
-                       Filterable="false">
+            Width="100px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="secType"
-                       Width="90px"
-                       Filterable="false">
+            Width="90px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="issuerN"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="moodys"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="fitch"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="dbrs"
-                       Width="60px"
-                       Filterable="false">
+            Width="60px"
+            Filterable="false">
             </IgbColumn>
             <IgbColumn Field="collatT"
-                       Width="90px"
-                       Filterable="false">
+            Width="90px"
+            Filterable="false">
             </IgbColumn>
         </IgbGrid>
 
@@ -379,7 +379,7 @@
     public IgbDialog Dialog;
     public IgbToast Toast;
     public object[] SelectedRows;
-    
+
     public string CurrentPriceStatus = "START PRICES";
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -475,14 +475,20 @@
     }
 
     public async void ShowChart()
-    {
+    {        
         this.SelectedRows = this.grid1.SelectedRows;
         if (this.SelectedRows == null || this.SelectedRows.Length == 0)
         {
             await this.Toast.ShowAsync();
             return;
         }
-        this.Chart.DataSource = this.SelectedRows;
+        object[] chartDs = new object[this.SelectedRows.Count()];
+        for (int i=0; i< this.SelectedRows.Count();i++)
+        {
+            int index = int.Parse(this.SelectedRows[i].ToString());
+            chartDs[i] = this.CurrentData[index];
+        }
+        this.Chart.DataSource = chartDs;
         this.Chart.IncludedProperties = new string[2] { "price", "country" };
         this.SetChartConfig("Countries", "Prices (USD)", "Data Chart with prices by Category and Country");
         await this.Dialog.ShowAsync();