diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java
index d507582..fcea1ea 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/APIServlet.java
@@ -109,7 +109,7 @@
         } else {
             resourcePath = requestURI;
         }
-                
+
         InputStream is = APIServlet.class.getResourceAsStream(resourcePath);
         if (is == null) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
@@ -117,18 +117,18 @@
         }
 
         // Special handler for font files and .png resources
-        if (resourcePath.endsWith(".png")) { 
-            
+        if (resourcePath.endsWith(".png")) {
+
             BufferedImage img = ImageIO.read(is);
             OutputStream outputStream = response.getOutputStream();
-            String formatName = "png";            
+            String formatName = "png";
             response.setContentType("image/png");
             ImageIO.write(img, formatName, outputStream);
             outputStream.close();
             return;
 
         }
-        
+
         response.setCharacterEncoding("utf-8");
         InputStreamReader isr = new InputStreamReader(is);
         StringBuilder sb = new StringBuilder();
diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index 3d435e4..727cfb8 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -63,7 +63,7 @@
                     var results = splitData[0].split('<h4>');
                     var components = results.slice(1, results.length);
                     var sections = components.length / resultCount.length;
-                    
+
                     for (resSet = 0; resSet < resultCount.length; resSet++) {
 
                         $('#output-message').append('<h4>' + components[(resSet+1)*sections - 1]);
@@ -77,12 +77,12 @@
                                 .css("margin-bottom", "1em")
                                 .html('Result Plan #' + resNum + '<i id="ibtn' + resSet + '" class="icon-plus extarget"></i>')
                                 .appendTo('#output-message');
-                        
+
                             $('<div/>')
                                 .attr("id", "collapse" + resSet)
                                 .attr("class", "collapse in")
                                 .appendTo('#output-message');
-                        
+
                             for (var c = 0; c < sections - 1; c++) {
                                 var pos = resSet*sections + c;
                                 $('#collapse' + resSet).append('<h4>' + components[pos]);
@@ -94,7 +94,7 @@
                             });
                             */
 
-			    $('#output-message').append("<hr/>");
+                            $('#output-message').append("<hr/>");
                         }
 
                     }
@@ -132,7 +132,7 @@
 
         <!-- Temporary logo placeholder -->
         <a class="brand" href="#"><img src="/webui/static/img/finalasterixlogo.png"></a>
-        
+
         <div class="nav-collapse collapse">
           <ul class="nav">
             <li><a href="http://code.google.com/p/asterixdb/" target="_blank">
