diff --git a/src/main/java/jp/sf/fess/Constants.java b/src/main/java/jp/sf/fess/Constants.java
index 04a212d52..0b9c28932 100644
--- a/src/main/java/jp/sf/fess/Constants.java
+++ b/src/main/java/jp/sf/fess/Constants.java
@@ -322,4 +322,6 @@ public class Constants extends CoreLibConstants {
 
     public static final String DEFAULT_OPERATOR = "defaultOperator";
 
+    public static final String INVALID_NUMERIC_PARAMETER = "-1";
+
 }
diff --git a/src/main/java/jp/sf/fess/action/IndexAction.java b/src/main/java/jp/sf/fess/action/IndexAction.java
index 6aa6f76ac..a1bd6bafc 100644
--- a/src/main/java/jp/sf/fess/action/IndexAction.java
+++ b/src/main/java/jp/sf/fess/action/IndexAction.java
@@ -196,6 +196,10 @@ public class IndexAction {
 
     public String execTime;
 
+    public String queryTime = Constants.INVALID_NUMERIC_PARAMETER;
+
+    public String searchTime = Constants.INVALID_NUMERIC_PARAMETER;
+
     public boolean partialResults;
 
     public List<Map<String, String>> labelTypeItems;
@@ -559,6 +563,8 @@ public class IndexAction {
     public String searchApi() {
         try {
             WebApiUtil.setObject("searchQuery", doSearchInternal());
+            WebApiUtil.setObject("searchTime", searchTime);
+            WebApiUtil.setObject("queryTime", queryTime);
             WebApiUtil.setObject("execTime", execTime);
             WebApiUtil.setObject("pageSize", pageSize);
             WebApiUtil.setObject("currentPageNumber", currentPageNumber);
@@ -1135,7 +1141,8 @@ public class IndexAction {
                 .includes("pageSize", "currentPageNumber", "allRecordCount",
                         "allPageCount", "existNextPage", "existPrevPage",
                         "currentStartRecordNumber", "currentEndRecordNumber",
-                        "pageNumberList", "partialResults").execute();
+                        "pageNumberList", "partialResults", "queryTime",
+                        "searchTime").execute();
 
         return query;
     }
diff --git a/src/main/java/jp/sf/fess/api/json/JsonApiManager.java b/src/main/java/jp/sf/fess/api/json/JsonApiManager.java
index 06e16e4fe..d22dff249 100644
--- a/src/main/java/jp/sf/fess/api/json/JsonApiManager.java
+++ b/src/main/java/jp/sf/fess/api/json/JsonApiManager.java
@@ -125,18 +125,19 @@ public class JsonApiManager extends BaseApiManager implements WebApiManager {
             buf.append("\"result\":[");
             boolean appended = false;
             for (Target target : pingResponse.getTargets()) {
-                if (!appended) {
+                if (appended) {
                     buf.append(',');
+                } else {
                     appended = true;
                 }
                 buf.append("{\"status\":");
                 buf.append(target.getStatus());
                 buf.append(",\"url\":\"");
-                buf.append(escapeJson(target.getRequestUrl()));
-                buf.append("\",\"qTime\":");
-                buf.append(target.getqTime());
+                buf.append(escapeJson(target.getUrl()));
+                buf.append("\",\"queryTime\":");
+                buf.append(target.getQueryTime());
                 buf.append(",\"searchTime\":");
-                buf.append(target.getElapsedTime());
+                buf.append(target.getSearchTime());
                 buf.append("}");
             }
             buf.append(']');
@@ -169,8 +170,8 @@ public class JsonApiManager extends BaseApiManager implements WebApiManager {
             WebApiUtil.validate();
             query = WebApiUtil.getObject("searchQuery");
             final String execTime = WebApiUtil.getObject("execTime");
-            final String qTime = WebApiUtil.getObject("qTime");
-            final String elapsedTime = WebApiUtil.getObject("elapsedTime");
+            final String queryTime = WebApiUtil.getObject("queryTime");
+            final String searchTime = WebApiUtil.getObject("searchTime");
             final String pageSize = WebApiUtil.getObject("pageSize");
             final String currentPageNumber = WebApiUtil
                     .getObject("currentPageNumber");
@@ -188,10 +189,10 @@ public class JsonApiManager extends BaseApiManager implements WebApiManager {
             buf.append(escapeJson(query));
             buf.append(",\"execTime\":");
             buf.append(execTime);
-            buf.append(",\"qTime\":");
-            buf.append(qTime);
+            buf.append(",\"queryTime\":");
+            buf.append(queryTime);
             buf.append(",\"searchTime\":");
-            buf.append(elapsedTime);
+            buf.append(searchTime);
             buf.append(',');
             if (StringUtil.isNotBlank(queryId)) {
                 buf.append("\"queryId\":");
diff --git a/src/main/java/jp/sf/fess/api/xml/XmlApiManager.java b/src/main/java/jp/sf/fess/api/xml/XmlApiManager.java
index fab6fa547..319bbd7a7 100644
--- a/src/main/java/jp/sf/fess/api/xml/XmlApiManager.java
+++ b/src/main/java/jp/sf/fess/api/xml/XmlApiManager.java
@@ -116,11 +116,11 @@ public class XmlApiManager extends BaseApiManager implements WebApiManager {
                 buf.append("<server><status>");
                 buf.append(target.getStatus());
                 buf.append("</status><url>");
-                buf.append(escapeXml(target.getRequestUrl()));
-                buf.append("</url><q-time>");
-                buf.append(target.getqTime());
-                buf.append("</q-time><search-time>");
-                buf.append(target.getElapsedTime());
+                buf.append(escapeXml(target.getUrl()));
+                buf.append("</url><query-time>");
+                buf.append(target.getQueryTime());
+                buf.append("</query-time><search-time>");
+                buf.append(target.getSearchTime());
                 buf.append("</search-time></server>");
             }
             buf.append("</result>");
@@ -153,8 +153,8 @@ public class XmlApiManager extends BaseApiManager implements WebApiManager {
             WebApiUtil.validate();
             query = WebApiUtil.getObject("searchQuery");
             final String execTime = WebApiUtil.getObject("execTime");
-            final String qTime = WebApiUtil.getObject("qTime");
-            final String elapsedTime = WebApiUtil.getObject("elapsedTime");
+            final String queryTime = WebApiUtil.getObject("queryTime");
+            final String searchTime = WebApiUtil.getObject("searchTime");
             final String pageSize = WebApiUtil.getObject("pageSize");
             final String currentPageNumber = WebApiUtil
                     .getObject("currentPageNumber");
@@ -174,11 +174,11 @@ public class XmlApiManager extends BaseApiManager implements WebApiManager {
             buf.append("<exec-time>");
             buf.append(execTime);
             buf.append("</exec-time>");
-            buf.append("<q-time>");
-            buf.append(qTime);
-            buf.append("</q-time>");
+            buf.append("<query-time>");
+            buf.append(queryTime);
+            buf.append("</query-time>");
             buf.append("<search-time>");
-            buf.append(elapsedTime);
+            buf.append(searchTime);
             buf.append("</search-time>");
             if (StringUtil.isNotBlank(queryId)) {
                 buf.append("<query-id>");
diff --git a/src/main/java/jp/sf/fess/entity/PingResponse.java b/src/main/java/jp/sf/fess/entity/PingResponse.java
index 6007892ba..a2bfa5421 100644
--- a/src/main/java/jp/sf/fess/entity/PingResponse.java
+++ b/src/main/java/jp/sf/fess/entity/PingResponse.java
@@ -28,33 +28,33 @@ public class PingResponse {
 
         private int status;
 
-        private String requestUrl;
+        private String url;
 
-        private long elapsedTime;
+        private long searchTime;
 
-        private int qTime;
+        private int queryTime;
 
-        public Target(int status, String requestUrl, long elapsedTime, int qTime) {
+        public Target(int status, String url, long elapsedTime, int qTime) {
             this.status = status;
-            this.requestUrl = requestUrl;
-            this.elapsedTime = elapsedTime;
-            this.qTime = qTime;
+            this.url = url;
+            this.searchTime = elapsedTime;
+            this.queryTime = qTime;
         }
 
         public int getStatus() {
             return status;
         }
 
-        public String getRequestUrl() {
-            return requestUrl;
+        public String getUrl() {
+            return url;
         }
 
-        public long getElapsedTime() {
-            return elapsedTime;
+        public long getSearchTime() {
+            return searchTime;
         }
 
-        public int getqTime() {
-            return qTime;
+        public int getQueryTime() {
+            return queryTime;
         }
 
     }
diff --git a/src/main/java/jp/sf/fess/util/QueryResponseList.java b/src/main/java/jp/sf/fess/util/QueryResponseList.java
index 0a785d099..6014d2e69 100644
--- a/src/main/java/jp/sf/fess/util/QueryResponseList.java
+++ b/src/main/java/jp/sf/fess/util/QueryResponseList.java
@@ -83,9 +83,9 @@ public class QueryResponseList implements List<Map<String, Object>> {
 
     protected boolean partialResults = false;
 
-    protected int qTime;
+    protected int queryTime;
 
-    protected long elapsedTime;
+    protected long searchTime;
 
     public QueryResponseList() {
         parent = new ArrayList<Map<String, Object>>();
@@ -103,8 +103,8 @@ public class QueryResponseList implements List<Map<String, Object>> {
             final SolrDocumentList sdList = queryResponse.getResults();
             start = sdList.getStart();
             numFound = sdList.getNumFound();
-            qTime = queryResponse.getQTime();
-            elapsedTime = queryResponse.getElapsedTime();
+            queryTime = queryResponse.getQTime();
+            searchTime = queryResponse.getElapsedTime();
 
             final Object partialResultsValue = queryResponse
                     .getResponseHeader().get(PARTIAL_RESULTS);
@@ -437,12 +437,12 @@ public class QueryResponseList implements List<Map<String, Object>> {
         return partialResults;
     }
 
-    public int getQTime() {
-        return qTime;
+    public int getQueryTime() {
+        return queryTime;
     }
 
-    public long getElapsedTime() {
-        return elapsedTime;
+    public long getSearchTime() {
+        return searchTime;
     }
 
 }