diff --git a/src/main/webapp/WEB-INF/views/applicationmap.filtered.view.jsp b/src/main/webapp/WEB-INF/views/applicationmap.filtered.view.jsp
index 61d39ef4e..5d4a807cc 100644
--- a/src/main/webapp/WEB-INF/views/applicationmap.filtered.view.jsp
+++ b/src/main/webapp/WEB-INF/views/applicationmap.filtered.view.jsp
@@ -189,7 +189,7 @@ $(document).ready(function () {
 			<hr/>
 
 			<a href="#" onclick="alert('Sorry. Not implemented.');">Filter passing transactions</a><br/>
-			<a href="#" onclick="showResponseScatter('{{= text}}', Nav.getQueryStartTime(), Nav.getQueryEndTime(), Nav.getQueryPeriod(), Nav.isQueryFromNow());">Transaction response scatter chart</a><br/>
+			<a href="#" onclick="showResponseScatter('{{= text}}', {{= query.from}}, {{= query.to}}, {{= query.period}}, {{= query.usePeriod}});">Transaction response scatter chart</a><br/>
 			<a href="#" onclick="showRequests('{{= text}}', {{= query.from}}, {{= query.to}}, {{= query.period}}, {{= query.usePeriod}});">Transaction list</a>
 
 		<button style="position:absolute;top:2px;right:34px;" onClick="man('applicationmap');"><i class="hippo-action-icon icon-question-sign"></i></button>
diff --git a/src/main/webapp/common/js/hippo/chart-scatter4.js b/src/main/webapp/common/js/hippo/chart-scatter4.js
index e2f8b86e9..92d524391 100644
--- a/src/main/webapp/common/js/hippo/chart-scatter4.js
+++ b/src/main/webapp/common/js/hippo/chart-scatter4.js
@@ -57,6 +57,8 @@ function showResponseScatter(applicationName, from, to, period, usePeriod, w, h)
     	showRequests(applicationName, from, to, period, usePeriod);
     });
     
+    $("#scatterChartContainer").show();
+    
 	var bDrawOnceAll = false,
 		nInterval = 2000;
 	
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 3c6a32f92..564d01bdf 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -172,9 +172,8 @@ $(document).ready(function () {
     	}
 
     	$("#progressbar").show();
-    	showServerMap(Nav.getApplicationName(), Nav.getServiceType(), Nav.getQueryStartTime(), Nav.getQueryEndTime(), Nav.getQueryPeriod(), Nav.isQueryFromNow(), null, function() { $("#progressbar").hide(); });
     	
-    	$("#scatterChartContainer").show();
+    	showServerMap(Nav.getApplicationName(), Nav.getServiceType(), Nav.getQueryStartTime(), Nav.getQueryEndTime(), Nav.getQueryPeriod(), Nav.isQueryFromNow(), null, function() { $("#progressbar").hide(); });
     	showResponseScatter(Nav.getApplicationName(), Nav.getQueryStartTime(), Nav.getQueryEndTime(), Nav.getQueryPeriod(), Nav.isQueryFromNow());
     }
     
@@ -283,7 +282,7 @@ $(document).ready(function () {
 			<hr/>
 
 			<a href="#" onclick="alert('Sorry. Not implemented.');">Filter passing transactions</a><br/>
-			<a href="#" onclick="showResponseScatter('{{= text}}', Nav.getQueryStartTime(), Nav.getQueryEndTime(), Nav.getQueryPeriod(), Nav.isQueryFromNow());">Transaction response scatter chart</a><br/>
+			<a href="#" onclick="showResponseScatter('{{= text}}', {{= query.from}}, {{= query.to}}, {{= query.period}}, {{= query.usePeriod}});">Transaction response scatter chart</a><br/>
 			<a href="#" onclick="showRequests('{{= text}}', {{= query.from}}, {{= query.to}}, {{= query.period}}, {{= query.usePeriod}});">Transaction list</a>
 
 		<button style="position:absolute;top:2px;right:34px;" onClick="man('applicationmap');"><i class="hippo-action-icon icon-question-sign"></i></button>