diff --git a/www/class/centreon-clapi/centreonContactGroup.class.php b/www/class/centreon-clapi/centreonContactGroup.class.php
index 3eb8cbbb128b73e7ea208c540f979ff7c8cd2210..2829f755ee532d6a6f738400f3b4c6369a513986 100644
--- a/www/class/centreon-clapi/centreonContactGroup.class.php
+++ b/www/class/centreon-clapi/centreonContactGroup.class.php
@@ -219,8 +219,8 @@ class CentreonContactGroup extends CentreonObject
     public function export($filter_id=null, $filter_name=null)
     {
         $filters = null;
-        if (!is_null($filter)) {
-            $filters['cg_id'] = $filter_id;
+        if (!is_null($filter_id)) {
+            $filters = array('cg_id' => $filter_id);
         }
         parent::export($filters);
         $obj = new \Centreon_Object_Relation_Contact_Group_Contact();
diff --git a/www/class/centreon-clapi/centreonInstance.class.php b/www/class/centreon-clapi/centreonInstance.class.php
index 09f8112c0d6cf942e9c37292b7db79491cfffbde..ab13ce2fb135197848f6ba718de1ace8dfda1a85 100644
--- a/www/class/centreon-clapi/centreonInstance.class.php
+++ b/www/class/centreon-clapi/centreonInstance.class.php
@@ -163,7 +163,7 @@ class CentreonInstance extends CentreonObject
         $elements = $this->object->getList($params, -1, 0, null, null, $filters);
         foreach ($elements as $tab) {
             if (isset($pollerState[$tab["id"]])) {
-                $tab["ns_status"] = $poller[$tab["id"]];
+                $tab["ns_status"] = $pollerState[$tab["id"]];
             } else {
                 $tab["ns_status"] = '-';
             }
@@ -226,4 +226,22 @@ class CentreonInstance extends CentreonObject
             echo $elem['host_id'] . $this->delim . $elem['host_name'] . $this->delim . $elem['host_address'] . "\n";
         }
     }
+
+    /**
+     * Export data
+     *
+     * @param null $filter_id
+     * @param null $filter_name
+     */
+    public function export($filter_id = null, $filter_name = null)
+    {
+        $filters = null;
+        if (!is_null($filter_id)) {
+            $filters = array(
+                $this->object->getPrimaryKey() => $filter_id
+            );
+        }
+
+        parent::export($filters);
+    }
 }
diff --git a/www/class/centreon-clapi/centreonObject.class.php b/www/class/centreon-clapi/centreonObject.class.php
index 1ac523da061108fa8c278ed9694e7ea118ae92c5..db95a36dad3518297f74030139d9a225ba0f796e 100644
--- a/www/class/centreon-clapi/centreonObject.class.php
+++ b/www/class/centreon-clapi/centreonObject.class.php
@@ -343,10 +343,10 @@ abstract class CentreonObject
     /**
      * Export data
      *
-     * @param string $parameters
+     * @param string $filters
      * @return void
      */
-    public function export($filters=null)
+    public function export($filters = null)
     {
         $elements = $this->object->getList("*", -1, 0, null, null, $filters, "AND");
         foreach ($elements as $element) {
diff --git a/www/include/views/graphs/javascript/centreon-graph.js b/www/include/views/graphs/javascript/centreon-graph.js
index c22351f7f6b7dbb01d550862bf81c1dd941a1173..35100725e8f72e599d6dca66f2402ee43d19547a 100644
--- a/www/include/views/graphs/javascript/centreon-graph.js
+++ b/www/include/views/graphs/javascript/centreon-graph.js
@@ -756,25 +756,26 @@
       }
       /* Append actions button */
       actionDiv = jQuery('<div>').addClass('chart-legend-action');
-      toggleCurves = jQuery('<img>').attr('src', './img/icons/rub.png')
-        .on('click', function () {
-          if (self.toggleAction === 'hide') {
-            self.toggleAction = 'show';
-            self.legendDiv.find('.chart-legend').addClass('hidden');
-            self.chart.hide();
-          } else {
-            self.toggleAction = 'hide';
-            self.legendDiv.find('.chart-legend').removeClass('hidden');
-            self.chart.show();
-          }
-        }).appendTo(actionDiv);
-      if (self.settings.extraLegend) {
-        expandLegend = jQuery('<img>').attr('src', './img/icons/info2.png')
+      if (this.settings.buttonToggleCurves) {
+        toggleCurves = jQuery('<img>').attr('src', './img/icons/rub.png')
           .on('click', function () {
-            self.legendDiv.toggleClass('extend');
+            if (self.toggleAction === 'hide') {
+              self.toggleAction = 'show';
+              self.legendDiv.find('.chart-legend').addClass('hidden');
+              self.chart.hide();
+            } else {
+              self.toggleAction = 'hide';
+              self.legendDiv.find('.chart-legend').removeClass('hidden');
+              self.chart.show();
+            }
           }).appendTo(actionDiv);
       }
-
+        if (self.settings.extraLegend) {
+            expandLegend = jQuery('<img>').attr('src', './img/icons/info2.png')
+                .on('click', function () {
+                    self.legendDiv.toggleClass('extend');
+                }).appendTo(actionDiv);
+        }
       actionDiv.appendTo(self.legendDiv);
     },
     /**
@@ -785,9 +786,6 @@
     buildExtraLegend: function (legends) {
       var self = this;
       var i;
-      if (!this.settings.extraLegend) {
-        return;
-      }
       jQuery('.chart-legend').each(function (idx, el) {
         var legendName = jQuery(el).data('legend');
         jQuery(el).find('.extra').remove();