diff --git a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/java/org/jboss/dashboard/ui/components/chart/NVD3ChartViewer.java b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/java/org/jboss/dashboard/ui/components/chart/NVD3ChartViewer.java
index dbab89e9..46116e57 100644
--- a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/java/org/jboss/dashboard/ui/components/chart/NVD3ChartViewer.java
+++ b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/java/org/jboss/dashboard/ui/components/chart/NVD3ChartViewer.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 package org.jboss.dashboard.ui.components.chart;
-
+import java.util.*;
 import org.jboss.dashboard.ui.Dashboard;
 import org.jboss.dashboard.dataset.DataSet;
 import org.jboss.dashboard.displayer.chart.AbstractChartDisplayer;
 import org.jboss.dashboard.domain.Interval;
+import org.jboss.dashboard.domain.label.LabelInterval;
 import org.jboss.dashboard.ui.components.DataDisplayerViewer;
 import org.jboss.dashboard.ui.components.DashboardHandler;
 import org.jboss.dashboard.provider.DataProperty;
@@ -36,12 +37,11 @@ public abstract class NVD3ChartViewer extends DataDisplayerViewer {
 
     public CommandResponse actionApplyLink(CommandRequest request) throws Exception {
         AbstractChartDisplayer abstractChartDisplayer = (AbstractChartDisplayer) getDataDisplayer();
-        DataProperty property = abstractChartDisplayer.getDomainProperty();
-        Integer series = Integer.decode(request.getRequestObject().getParameter(PARAM_NSERIE));
-        DataSet dataSet = abstractChartDisplayer.buildXYDataSet();
-        Interval interval = (Interval) dataSet.getValueAt(series, 0);
+        DataProperty property = abstractChartDisplayer.getDomainProperty();		
+        ArrayList<String> list = new ArrayList<String>();
+        list.add(request.getRequestObject().getParameter(PARAM_NSERIE));		        
         Dashboard dashboard = DashboardHandler.lookup().getCurrentDashboard();
-        if (dashboard.filter(property.getPropertyId(), interval, FilterByCriteria.ALLOW_ANY)) {
+        if (dashboard.filter(property.getPropertyId(), null, true, null, true, list, FilterByCriteria.ALLOW_ANY)) {
             return new ShowCurrentScreenResponse();
         }
         return null;
diff --git a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_barchart_script.jsp b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_barchart_script.jsp
index 758dade2..0278a8fc 100644
--- a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_barchart_script.jsp
+++ b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_barchart_script.jsp
@@ -76,7 +76,7 @@
        <% if( enableDrillDown ) {%>
           graph.discretebar.dispatch.on('elementClick', function(e) {
           form = document.getElementById('<%="form"+chartId%>');
-          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = e.pointIndex;
+          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = e.point.label;
           submitAjaxForm(form);
           });
        <% } %>
diff --git a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_line2chart_script.jsp b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_line2chart_script.jsp
index 1545c24f..dfa4bd19 100644
--- a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_line2chart_script.jsp
+++ b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_line2chart_script.jsp
@@ -96,7 +96,7 @@
   <% if( enableDrillDown ) {%>
     graph.lines.dispatch.on('elementClick', function(e) {
           form = document.getElementById('<%="form"+chartId%>');
-          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = e.pointIndex;
+          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = chartLabels<%=chartId%>[e.pointIndex];
           submitAjaxForm(form);
           });
   <% } %>
diff --git a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_linechart_script.jsp b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_linechart_script.jsp
index 87c88af0..80389099 100644
--- a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_linechart_script.jsp
+++ b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_linechart_script.jsp
@@ -86,7 +86,7 @@
   <% if( enableDrillDown ) {%>
     graph.lines.dispatch.on('elementClick', function(e) {
           form = document.getElementById('<%="form"+chartId%>');
-          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = e.pointIndex;
+          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = chartLabels<%=chartId%>[e.pointIndex];
           submitAjaxForm(form);
           });
   <% } %>
diff --git a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_piechart_script.jsp b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_piechart_script.jsp
index 407f6186..7ba9ee93 100644
--- a/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_piechart_script.jsp
+++ b/modules/dashboard-ui/dashboard-ui-chartlibs/dashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_piechart_script.jsp
@@ -60,7 +60,7 @@
        <% if( enableDrillDown ) {%>
           graph.pie.dispatch.on('elementClick', function(e) {
           form = document.getElementById('<%="form"+chartId%>');
-          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = e.index;
+          form.<%= NVD3ChartViewer.PARAM_NSERIE %>.value = e.label;
           submitAjaxForm(form);
           });
        <% } %>