2 files changed, 13 insertions, 2 deletions
diff --git a/src/client/views/nodes/DataVizBox/components/Chart.scss b/src/client/views/nodes/DataVizBox/components/Chart.scss
index cf0007cfd..47cad9649 100644
--- a/src/client/views/nodes/DataVizBox/components/Chart.scss
+++ b/src/client/views/nodes/DataVizBox/components/Chart.scss
@@ -15,8 +15,7 @@
         font-size: larger;
         display: flex;
         flex-direction: row;
-        margin-top: -20px;
-        margin-bottom: -20px;
+        margin-top: -35px;
     }
     .asHistogram-checkBox {
         align-items: left;
diff --git a/src/client/views/nodes/DataVizBox/components/Histogram.tsx b/src/client/views/nodes/DataVizBox/components/Histogram.tsx
index 6672603f3..ff0262c15 100644
--- a/src/client/views/nodes/DataVizBox/components/Histogram.tsx
+++ b/src/client/views/nodes/DataVizBox/components/Histogram.tsx
@@ -164,6 +164,18 @@ export class Histogram extends ObservableReactComponent<HistogramProps> {
                     sameAsCurrent = this._currSelected ? showSelected[xAxisTitle] == this._currSelected![xAxisTitle] && showSelected[yAxisTitle] == this._currSelected![yAxisTitle] : false;
                     this._currSelected = sameAsCurrent ? undefined : showSelected;
                     this.selectedData = sameAsCurrent ? undefined : d;
+
+                    // for filtering child dataviz docs
+                    const selectedRows = Cast(this._props.layoutDoc.dataViz_selectedRows, listSpec('number'), null);
+                    this._tableDataIds.forEach(rowID => {
+                        let match = true;
+                        Object.keys(showSelected).map(key => {
+                            if(key!='frequency' && this._props.records[rowID][key]!=showSelected[key]){
+                                match = false;
+                            }
+                        })
+                        if (match && !selectedRows?.includes(rowID)) selectedRows?.push(rowID);
+                    })
                 } else this.hoverOverData = d;
                 return true;
             }