diff --git a/asterix-examples/src/main/resources/black-cherry/cherry.tpl b/asterix-examples/src/main/resources/black-cherry/cherry.tpl
index 74dfe99..1165ea2 100755
--- a/asterix-examples/src/main/resources/black-cherry/cherry.tpl
+++ b/asterix-examples/src/main/resources/black-cherry/cherry.tpl
@@ -128,6 +128,7 @@
                   <li class="list-group-item">
                     <h4 class="list-group-item-heading">Keyword</h4>
                     <input type="text" id="keyword-textbox" placeholder="Enter a keyword, e.g., verizon">
+                    <div id="keyword-message"></div>
                   </li>
 
                   <!-- Location -->
diff --git a/asterix-examples/src/main/resources/black-cherry/static/js/asterix-sdk-stable.js b/asterix-examples/src/main/resources/black-cherry/static/js/asterix-sdk-stable.js
index fc93875..16e5bb6 100755
--- a/asterix-examples/src/main/resources/black-cherry/static/js/asterix-sdk-stable.js
+++ b/asterix-examples/src/main/resources/black-cherry/static/js/asterix-sdk-stable.js
@@ -261,7 +261,7 @@
             // on the REST API side, it just means we got something back. This also contains the
             // error return codes, which need to be handled before we call th success function.
             success     : function(data) {
-                
+
                 // Check Asterix Response for errors
                 // See http://asterix.ics.uci.edu/documentation/api.html#ErrorCodes
                 if (data["error-code"]) { 
@@ -277,6 +277,9 @@
             // error. Network errors, empty response bodies, syntax errors, and a number of others
             // can pop up. 
             error       : function(data) {
+
+                alert(JSON.stringify(data));
+
                 // Some of the Asterix API endpoints return empty responses on success.
                 // However, the ajax function treats these as errors while reporting a
                 // 200 OK code with no payload. So we will check for that, otherwise 
@@ -285,8 +288,7 @@
                 if (data["status"] == 200 && data["responseText"] == "") {
                     success_fn(data);
                 } else {
-                    thi
-                     alert("[Ajax Error]\n" + JSON.stringify(data));
+                    alert("[Ajax Error]\n" + JSON.stringify(data));
                 }
             }
         });
diff --git a/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js b/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
index 6552d70..92a6e60 100755
--- a/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
+++ b/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
@@ -45,20 +45,6 @@
         }, 
         asynchronousQueryGetInterval()
     );
-
-
-    // Initialize data structures
-    APIqueryTracker = {};
-    asyncQueryManager = {};
-    drilldown_data_map = {};
-    drilldown_data_map_vals = {};
-
-    map_cells = [];
-    map_tweet_markers = [];
-    map_info_windows = {};
-
-    review_mode_tweetbooks = [];
-    getAllDataverseTweetbooks();
     
     // Legend Container
     // Create a rainbow from a pretty color scheme. 
@@ -67,7 +53,7 @@
     rainbow.setSpectrum("#E8DDCB", "#CDB380", "#036564", "#033649", "#031634");
     buildLegend();
     
-    // Initialization of demo datastructures, map, tabs
+    // Initialization of UI Tabas
     initDemoPrepareTabs();
 
     // UI Elements - Creates Map, Location Auto-Complete, Selection Rectangle
@@ -141,16 +127,26 @@
         }
     };
 
-
-    
-
     // Open about tab to start user on a tutorial
     //$('#mode-tabs a:first').tab('show') // Select first tab
 
-    
-    // UI Elements - A button to clear current map and query data
-    $("#clear-button").click(mapWidgetResetMap); 
-    
+    // Initialize data structures
+    APIqueryTracker = {};
+    asyncQueryManager = {};
+    drilldown_data_map = {};
+    drilldown_data_map_vals = {};
+    map_cells = [];
+    map_tweet_markers = [];
+    map_info_windows = {};
+    review_mode_tweetbooks = [];
+    getAllDataverseTweetbooks();
+ 
+    initDemoUIButtonControls();
+});
+
+function initDemoUIButtonControls() {
+
+    // Explore Mode - Update Sliders
     var updateSliderDisplay = function(event, ui) {
         if (event.target.id == "grid-lat-slider") {
             $("#gridlat").text(""+ui.value);
@@ -158,23 +154,21 @@
           $("#gridlng").text(""+ui.value);
         }
     };
-    
     sliderOptions = {
         max: 10,
-        min: 1.5,
+        min: 2.0,
         step: .1,
-        value: 2.0,
+        value: 3.0,
         slidechange: updateSliderDisplay,
         slide: updateSliderDisplay,
         start: updateSliderDisplay,
         stop: updateSliderDisplay
     };
-
     $("#gridlat").text(""+sliderOptions.value);
     $("#gridlng").text(""+sliderOptions.value);
     $(".grid-slider").slider(sliderOptions);
-    
-    // UI Elements - Date Pickers
+
+    // Explore Mode - Query Builder Date Pickers
     var dateOptions = {
         dateFormat: "yy-mm-dd",
         defaultDate: "2012-01-02",
@@ -186,8 +180,8 @@
     dateOptions['defaultDate'] = "2012-12-31";
     var end_dp= $("#end-date").datepicker(dateOptions);
     end_dp.val(dateOptions.defaultDate);
-
-    // UI Elements - Toggle location search style by location or by map selection
+    
+    // Explore Mode: Toggle Selection/Location Search
     $('#selection-button').on('click', function (e) {
         $("#location-text-box").attr("disabled", "disabled");
         if (selectionRect) {
@@ -200,26 +194,30 @@
             selectionRect.setMap(null);
         }
     });
-    $("#selection-button").button('toggle');
+    $("#selection-button").trigger("click");
 
+    // Review Mode: New Tweetbook
     $('#new-tweetbook-button').on('click', function (e) {
         onCreateNewTweetBook($('#new-tweetbook-entry').val());
         
         $('#new-tweetbook-entry').val("");
         $('#new-tweetbook-entry').attr("placeholder", "Name a new tweetbook");
     });
-     
-    // UI Element - Query Submission
+
+    // Explore Mode - Clear Button
+    $("#clear-button").click(mapWidgetResetMap); 
+
+    // Explore Mode: Query Submission
     $("#submit-button").on("click", function () {
-    	
+
         var kwterm = $("#keyword-textbox").val();
         if (kwterm == "") {
-            reportUserMessage("Please enter a search term!", false, "report-message");
+            reportUserMessage("Please enter a search keyword!", false, "keyword-message");
         } else {
         
-            $("#report-message").html('');
+            $("#report-message", "#keyword-message").html('');
             $("#submit-button").attr("disabled", true);
-    	
+        
             var startdp = $("#start-date").datepicker("getDate");
             var enddp = $("#end-date").datepicker("getDate");
             var startdt = $.datepicker.formatDate("yy-mm-dd", startdp)+"T00:00:00Z";
@@ -233,42 +231,44 @@
                 "gridlng": $("#grid-lng-slider").slider("value")
             };
 
-    	    // Get Map Bounds
-    	    var bounds;
+            // Get Map Bounds
+            var bounds;
             if ($('#selection-button').hasClass("active") && selectionRect) {
                 bounds = selectionRect.getBounds();
             } else {
                 bounds = map.getBounds();
             }
-    	
-    	    var swLat = Math.abs(bounds.getSouthWest().lat());
-    	    var swLng = Math.abs(bounds.getSouthWest().lng());
-    	    var neLat = Math.abs(bounds.getNorthEast().lat());
-    	    var neLng = Math.abs(bounds.getNorthEast().lng());
-    	
-    	    formData["swLat"] = Math.min(swLat, neLat);
-    	    formData["swLng"] = Math.max(swLng, neLng);
-    	    formData["neLat"] = Math.max(swLat, neLat);
-    	    formData["neLng"] = Math.min(swLng, neLng);
+        
+            var swLat = Math.abs(bounds.getSouthWest().lat());
+            var swLng = Math.abs(bounds.getSouthWest().lng());
+            var neLat = Math.abs(bounds.getNorthEast().lat());
+            var neLng = Math.abs(bounds.getNorthEast().lng());
+        
+            formData["swLat"] = Math.min(swLat, neLat);
+            formData["swLng"] = Math.max(swLng, neLng);
+            formData["neLat"] = Math.max(swLat, neLat);
+            formData["neLng"] = Math.min(swLng, neLng);
 
-		    var build_cherry_mode = "synchronous";
-		
-		    if ($('#asbox').is(":checked")) {
-		        build_cherry_mode = "asynchronous";
-		        $('#show-query-button').attr("disabled", false);
-		    } else {
-		        $('#show-query-button').attr("disabled", true);
-		    }
-	
+            var build_cherry_mode = "synchronous";
+        
+            if ($('#asbox').is(":checked")) {
+                build_cherry_mode = "asynchronous";
+                $('#show-query-button').attr("disabled", false);
+            } else {
+                $('#show-query-button').attr("disabled", true);
+            }
+    
             var f = buildAQLQueryFromForm(formData);
         
             APIqueryTracker = {
-		        "query" : "use dataverse twitter;\n" + f.val(),
-		        "data" : formData
-		    };
-		
-		    // TODO Make dialog work correctly.
-		    //$('#dialog').html(APIqueryTracker["query"]);
+                "query" : "use dataverse twitter;\n" + f.val(),
+                "data" : formData
+            };
+        
+            alert(f.val());
+
+            // TODO Make dialog work correctly.
+            //$('#dialog').html(APIqueryTracker["query"]);
         
             if (build_cherry_mode == "synchronous") {
                 A.query(f.val(), cherryQuerySyncCallback, build_cherry_mode);
@@ -283,7 +283,7 @@
             }
         }
     });
-});
+}
 
 /**
 * Builds AsterixDB REST Query from explore mode form.
@@ -326,8 +326,6 @@
 
 /**
 * getAllDataverseTweetbooks
-* 
-* no params
 *  
 * Returns all datasets of type TweetbookEntry, populates review_mode_tweetbooks
 */
@@ -366,8 +364,6 @@
     A.meta(getTweetbooksQuery.val(), tweetbooksSuccess);
 }
 
-/** Asynchronous Query Management **/
-
 /**
 * Checks through each asynchronous query to see if they are ready yet
 */
@@ -489,9 +485,7 @@
 
 /**
 * cleanJSON
-*
 * @param json, a JSON string that is not correctly formatted.
-*
 * Quick and dirty little function to clean up an Asterix JSON quirk.
 */
 function cleanJSON(json) {
@@ -515,7 +509,7 @@
     var weights = [];
     var maxWeight = 0;
     var minWeight = Number.MAX_VALUE;
-    
+
     // Parse resulting JSON objects. Here is an example record:
     // { "cell": { rectangle: [{ point: [22.5, 64.5]}, { point: [24.5, 66.5]}]}, "count": { int64: 5 }}
     $.each(res.results, function(i, data) {