diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRenderer.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRenderer.java
index ed4cce4e9f4..4561f130632 100644
--- a/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRenderer.java
+++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRenderer.java
@@ -28,6 +28,10 @@ public class NodeStatsRenderer extends AbstractRenderer<NodeStatsMarvelDoc> {
             "node_stats.indices.store.size_in_bytes",
             "node_stats.indices.store.throttle_time_in_millis",
             "node_stats.indices.indexing.throttle_time_in_millis",
+            "node_stats.indices.indexing.index_total",
+            "node_stats.indices.indexing.index_time_in_millis",
+            "node_stats.indices.search.query_total",
+            "node_stats.indices.search.query_time_in_millis",
             "node_stats.indices.segments.count",
             "node_stats.fs.total.total_in_bytes",
             "node_stats.fs.total.free_in_bytes",
diff --git a/marvel/src/test/resources/samples/marvel_node_stats.json b/marvel/src/test/resources/samples/marvel_node_stats.json
index 65801643681..c281c765814 100644
--- a/marvel/src/test/resources/samples/marvel_node_stats.json
+++ b/marvel/src/test/resources/samples/marvel_node_stats.json
@@ -15,8 +15,14 @@
         "size_in_bytes": 0,
         "throttle_time_in_millis": 0
       },
-      "indexing": {
-        "throttle_time_in_millis": 0
+      "indexing" : {
+        "index_total" : 1,
+        "index_time_in_millis" : 60,
+        "throttle_time_in_millis" : 0
+      },
+      "search" : {
+        "query_total" : 0,
+        "query_time_in_millis" : 0
       },
       "segments": {
         "count": 0