diff --git a/public/app/plugins/datasource/elasticsearch/partials/config.html b/public/app/plugins/datasource/elasticsearch/partials/config.html
index d08a83238ad..595588c1be0 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/config.html
@@ -31,7 +31,7 @@
 	</ul>
 	<div class="clearfix"></div>
 </div>
-<div class="tight-form">
+<div class="tight-form last">
 	<ul class="tight-form-list">
 		<li class="tight-form-item" style="width: 144px">
 			Version
@@ -42,10 +42,13 @@
 	</ul>
 	<div class="clearfix"></div>
 </div>
+</div>
+
+<h5>Default query settings</h5>
 
 <div class="tight-form last">
 	<ul class="tight-form-list">
-		<li class="tight-form-item" style="width: 144px">
+		<li class="tight-form-item" style="width: 200px">
 			Group by time interval
 		</li>
 		<li>
@@ -53,7 +56,7 @@
 						 spellcheck='false' placeholder="example: >10s">
 		</li>
 		<li class="tight-form-item">
-			<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i>
+			<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >10s'" data-placement="right"></i>
 		</li>
 	</ul>
 	<div class="clearfix"></div>