diff --git a/main/src/com/google/refine/browsing/facets/ListFacet.java b/main/src/com/google/refine/browsing/facets/ListFacet.java
index 6c6a2e34f..2c0941f02 100644
--- a/main/src/com/google/refine/browsing/facets/ListFacet.java
+++ b/main/src/com/google/refine/browsing/facets/ListFacet.java
@@ -107,6 +107,7 @@ public class ListFacet implements Facet {
             writer.key("error"); writer.value(_errorMessage);
         } else if (_choices.size() > getLimit()) {
             writer.key("error"); writer.value("Too many choices");
+            writer.key("choiceCount"); writer.value(_choices.size());
         } else {
             writer.key("choices"); writer.array();
             for (NominalFacetChoice choice : _choices) {
diff --git a/main/webapp/modules/core/scripts/facets/list-facet.js b/main/webapp/modules/core/scripts/facets/list-facet.js
index b8a42f3a4..b9c285a81 100644
--- a/main/webapp/modules/core/scripts/facets/list-facet.js
+++ b/main/webapp/modules/core/scripts/facets/list-facet.js
@@ -7,13 +7,13 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-    * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -29,645 +29,693 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-*/
+ */
 
 function ListFacet(div, config, options, selection) {
-    this._div = div;
-    this._config = config;
-    if (!("invert" in this._config)) {
-        this._config.invert = false;
-    }
-    
-    this._options = options || {};
-    if (!("sort" in this._options)) {
-        this._options.sort = "name";
-    }
-    
-    this._selection = selection || [];
-    this._blankChoice = (config.selectBlank) ? { s : true, c : 0 } : null;
-    this._errorChoice = (config.selectError) ? { s : true, c : 0 } : null;
-    
-    this._data = null;
-    
-    this._initializeUI();
-    this._update();
+  this._div = div;
+  this._config = config;
+  if (!("invert" in this._config)) {
+    this._config.invert = false;
+  }
+
+  this._options = options || {};
+  if (!("sort" in this._options)) {
+    this._options.sort = "name";
+  }
+
+  this._selection = selection || [];
+  this._blankChoice = (config.selectBlank) ? { s : true, c : 0 } : null;
+  this._errorChoice = (config.selectError) ? { s : true, c : 0 } : null;
+
+  this._data = null;
+
+  this._initializeUI();
+  this._update();
 }
 
 ListFacet.reconstruct = function(div, uiState) {
-    return new ListFacet(div, uiState.c, uiState.o, uiState.s);
+  return new ListFacet(div, uiState.c, uiState.o, uiState.s);
 };
 
 ListFacet.prototype.dispose = function() {
 };
 
 ListFacet.prototype.reset = function() {
-    this._selection = [];
-    this._blankChoice = null;
-    this._errorChoice = null;
+  this._selection = [];
+  this._blankChoice = null;
+  this._errorChoice = null;
 };
 
 ListFacet.prototype.getUIState = function() {
-    var json = {
-        c: this.getJSON(),
-        o: this._options
-    };
-    
-    json.s = json.c.selection;
-    delete json.c.selection;
-    
-    return json;
+  var json = {
+      c: this.getJSON(),
+      o: this._options
+  };
+
+  json.s = json.c.selection;
+  delete json.c.selection;
+
+  return json;
 };
 
 ListFacet.prototype.getJSON = function() {
-    var o = {
-        type: "list",
-        name: this._config.name,
-        columnName: this._config.columnName,
-        expression: this._config.expression,
-        omitBlank: "omitBlank" in this._config ? this._config.omitBlank : false,
-        omitError: "omitError" in this._config ? this._config.omitError : false,
-        selection: [],
-        selectBlank: this._blankChoice !== null && this._blankChoice.s,
-        selectError: this._errorChoice !== null && this._errorChoice.s,
-        invert: this._config.invert
+  var o = {
+      type: "list",
+      name: this._config.name,
+      columnName: this._config.columnName,
+      expression: this._config.expression,
+      omitBlank: "omitBlank" in this._config ? this._config.omitBlank : false,
+          omitError: "omitError" in this._config ? this._config.omitError : false,
+              selection: [],
+              selectBlank: this._blankChoice !== null && this._blankChoice.s,
+              selectError: this._errorChoice !== null && this._errorChoice.s,
+              invert: this._config.invert
+  };
+  for (var i = 0; i < this._selection.length; i++) {
+    var choice = {
+        v: cloneDeep(this._selection[i].v)
     };
-    for (var i = 0; i < this._selection.length; i++) {
-        var choice = {
-            v: cloneDeep(this._selection[i].v)
-        };
-        o.selection.push(choice);
-    }
-    return o;
+    o.selection.push(choice);
+  }
+  return o;
 };
 
 ListFacet.prototype.hasSelection = function() {
-    return this._selection.length > 0 || 
-        (this._blankChoice !== null && this._blankChoice.s) || 
-        (this._errorChoice !== null && this._errorChoice.s);
+  return this._selection.length > 0 || 
+  (this._blankChoice !== null && this._blankChoice.s) || 
+  (this._errorChoice !== null && this._errorChoice.s);
 };
 
 ListFacet.prototype.updateState = function(data) {
-    this._data = data;
-    
-    if ("choices" in data) {
-        var selection = [];
-        var choices = data.choices;
-        for (var i = 0; i < choices.length; i++) {
-            var choice = choices[i];
-            if (choice.s) {
-                selection.push(choice);
-            }
-        }
-        this._selection = selection;
-        this._reSortChoices();
-    
-        this._blankChoice = data.blankChoice || null;
-        this._errorChoice = data.errorChoice || null;
+  this._data = data;
+
+  if ("choices" in data) {
+    var selection = [];
+    var choices = data.choices;
+    for (var i = 0; i < choices.length; i++) {
+      var choice = choices[i];
+      if (choice.s) {
+        selection.push(choice);
+      }
     }
-    
-    this._update();
+    this._selection = selection;
+    this._reSortChoices();
+
+    this._blankChoice = data.blankChoice || null;
+    this._errorChoice = data.errorChoice || null;
+  }
+
+  this._update();
 };
 
 ListFacet.prototype._reSortChoices = function() {
-    this._data.choices.sort(this._options.sort == "name" ?
-        function(a, b) {
-            return a.v.l.localeCompare(b.v.l);
-        } :
-        function(a, b) {
-            var c = b.c - a.c;
-            return c !== 0 ? c : a.v.l.localeCompare(b.v.l);
-        }
-    );
+  this._data.choices.sort(this._options.sort == "name" ?
+      function(a, b) {
+    return a.v.l.localeCompare(b.v.l);
+  } :
+    function(a, b) {
+    var c = b.c - a.c;
+    return c !== 0 ? c : a.v.l.localeCompare(b.v.l);
+  }
+  );
 };
 
 ListFacet.prototype._initializeUI = function() {
-    var self = this;
-    
-    var facet_id = this._div.attr("id");
-    
-    this._div.empty().show().html(
-        '<div class="facet-title">' +
-            '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
-                '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
-                '<td>' +
-                    '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
-                    '<a href="javascript:{}" class="facet-choice-link" bind="invertButton">invert</a>' +
-                    '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">change</a>' +
-                    '<span bind="titleSpan"></span>' +
-                '</td>' +
-            '</tr></table></div>' +
-        '</div>' +
-        '<div class="facet-expression" bind="expressionDiv" title="Click to edit expression"></div>' +
-        '<div class="facet-controls" bind="controlsDiv" style="display:none;">' +
-          '<a bind="choiceCountContainer" class="action" href="javascript:{}"></a> <span class="facet-controls-sortControls" bind="sortGroup">Sort by: ' +
-            '<a href="javascript:{}" bind="sortByNameLink">name</a>' +
-            '<a href="javascript:{}" bind="sortByCountLink">count</a>' +
-          '</span>' +
-          '<button bind="clusterLink" class="facet-controls-button button">Cluster</button>' +
-        '</div></div>' +
-        '<div class="facet-body" bind="bodyDiv">' +
-            '<div class="facet-body-inner" bind="bodyInnerDiv"></div>' +
-        '</div>'
-    );
-    this._elmts = DOM.bind(this._div);
-    
-    this._elmts.titleSpan.text(this._config.name);
-    this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
-        self._elmts.expressionDiv.slideToggle(100, function() {
-            if (self._elmts.expressionDiv.css("display") != "none") {
-                self._editExpression();
-            }
-        });
-    });
-    this._elmts.expressionDiv.text(this._config.expression).hide().click(function() { self._editExpression(); });
-    this._elmts.removeButton.click(function() { self._remove(); });
-    this._elmts.resetButton.click(function() { self._reset(); });
-    this._elmts.invertButton.click(function() { self._invert(); });
+  var self = this;
 
-    this._elmts.choiceCountContainer.click(function() { self._copyChoices(); });
-    this._elmts.sortByCountLink.click(function() {
-        if (self._options.sort != "count") {
-            self._options.sort = "count";
-            self._reSortChoices();
-            self._update(true);
-        }
+  var facet_id = this._div.attr("id");
+
+  this._div.empty().show().html(
+      '<div class="facet-title">' +
+        '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
+          '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
+          '<td>' +
+            '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
+            '<a href="javascript:{}" class="facet-choice-link" bind="invertButton">invert</a>' +
+            '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">change</a>' +
+            '<span bind="titleSpan"></span>' +
+          '</td>' +
+        '</tr></table></div>' +
+      '</div>' +
+      '<div class="facet-expression" bind="expressionDiv" title="Click to edit expression"></div>' +
+      '<div class="facet-controls" bind="controlsDiv" style="display:none;">' +
+        '<a bind="choiceCountContainer" class="action" href="javascript:{}"></a> ' +
+        '<span class="facet-controls-sortControls" bind="sortGroup">Sort by: ' +
+          '<a href="javascript:{}" bind="sortByNameLink">name</a>' +
+          '<a href="javascript:{}" bind="sortByCountLink">count</a>' +
+        '</span>' +
+        '<button bind="clusterLink" class="facet-controls-button button">Cluster</button>' +
+      '</div>' +
+      '<div class="facet-body" bind="bodyDiv">' +
+        '<div class="facet-body-inner" bind="bodyInnerDiv"></div>' +
+      '</div>'
+  );
+  this._elmts = DOM.bind(this._div);
+
+  this._elmts.titleSpan.text(this._config.name);
+  this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
+    self._elmts.expressionDiv.slideToggle(100, function() {
+      if (self._elmts.expressionDiv.css("display") != "none") {
+        self._editExpression();
+      }
     });
-    this._elmts.sortByNameLink.click(function() {
-        if (self._options.sort != "name") {
-            self._options.sort = "name";
-            self._reSortChoices();
-            self._update(true);
-        }
+  });
+  this._elmts.expressionDiv.text(this._config.expression).hide().click(function() { self._editExpression(); });
+  this._elmts.removeButton.click(function() { self._remove(); });
+  this._elmts.resetButton.click(function() { self._reset(); });
+  this._elmts.invertButton.click(function() { self._invert(); });
+
+  this._elmts.choiceCountContainer.click(function() { self._copyChoices(); });
+  this._elmts.sortByCountLink.click(function() {
+    if (self._options.sort != "count") {
+      self._options.sort = "count";
+      self._reSortChoices();
+      self._update(true);
+    }
+  });
+  this._elmts.sortByNameLink.click(function() {
+    if (self._options.sort != "name") {
+      self._options.sort = "name";
+      self._reSortChoices();
+      self._update(true);
+    }
+  });
+
+  this._elmts.clusterLink.click(function() { self._doEdit(); });
+  if (this._config.expression != "value" && this._config.expression != "grel:value") {
+    this._elmts.clusterLink.hide();
+  }
+
+  if (!("scroll" in this._options) || this._options.scroll) {
+    this._elmts.bodyDiv.addClass("facet-body-scrollable");
+    this._elmts.bodyDiv.resizable({
+      minHeight: 30,
+      handles: 's',
+      stop: function(event, ui) {
+        event.target.style.width = "auto"; // don't force the width
+      }
     });
-        
-    this._elmts.clusterLink.click(function() { self._doEdit(); });
-    if (this._config.expression != "value" && this._config.expression != "grel:value") {
-        this._elmts.clusterLink.hide();
-    }
-    
-    if (!("scroll" in this._options) || this._options.scroll) {
-        this._elmts.bodyDiv.addClass("facet-body-scrollable");
-        this._elmts.bodyDiv.resizable({
-            minHeight: 30,
-            handles: 's',
-            stop: function(event, ui) {
-                event.target.style.width = "auto"; // don't force the width
-            }
-        });
-    }
+  }
 };
 
 ListFacet.prototype._copyChoices = function() {
-    var self = this;
-    var frame = DialogSystem.createDialog();
-    frame.width("600px");
-    
-    var header = $('<div></div>').addClass("dialog-header").text("Facet Choices as Tab Separated Values").appendTo(frame);
-    var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
-    var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
-    
-    body.html('<textarea wrap="off" bind="textarea" style="display: block; width: 100%; height: 400px;" />');
-    var elmts = DOM.bind(body);
-    
-    $('<button class="button"></button>').text("Close").click(function() {
-        DialogSystem.dismissUntil(level - 1);
-    }).appendTo(footer);
-    
-    var lines = [];
-    for (var i = 0; i < this._data.choices.length; i++) {
-        var choice = this._data.choices[i];
-        lines.push(choice.v.l + "\t" + choice.c);
-    }
-    if (this._blankChoice) {
-        lines.push("(blank)\t" + this._blankChoice.c);
-    }
-    if (this._errorChoice) {
-        lines.push("(error)\t" + this._errorChoice.c);
-    }
-    
-    var level = DialogSystem.showDialog(frame);
-    
-    var textarea = elmts.textarea[0];
-    textarea.value = lines.join("\n");
-    textarea.focus();
-    textarea.select();
+  var self = this;
+  var frame = DialogSystem.createDialog();
+  frame.width("600px");
+
+  var header = $('<div></div>').addClass("dialog-header").text("Facet Choices as Tab Separated Values").appendTo(frame);
+  var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
+  var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
+
+  body.html('<textarea wrap="off" bind="textarea" style="display: block; width: 100%; height: 400px;" />');
+  var elmts = DOM.bind(body);
+
+  $('<button class="button"></button>').text("Close").click(function() {
+    DialogSystem.dismissUntil(level - 1);
+  }).appendTo(footer);
+
+  var lines = [];
+  for (var i = 0; i < this._data.choices.length; i++) {
+    var choice = this._data.choices[i];
+    lines.push(choice.v.l + "\t" + choice.c);
+  }
+  if (this._blankChoice) {
+    lines.push("(blank)\t" + this._blankChoice.c);
+  }
+  if (this._errorChoice) {
+    lines.push("(error)\t" + this._errorChoice.c);
+  }
+
+  var level = DialogSystem.showDialog(frame);
+
+  var textarea = elmts.textarea[0];
+  textarea.value = lines.join("\n");
+  textarea.focus();
+  textarea.select();
 };
 
 ListFacet.prototype._update = function(resetScroll) {
-    var self = this;
-    
-    var invert = this._config.invert;
-    if (invert) {
-        this._elmts.bodyInnerDiv.addClass("facet-mode-inverted");
-        this._elmts.invertButton.addClass("facet-mode-inverted");
-    } else {
-        this._elmts.bodyInnerDiv.removeClass("facet-mode-inverted");
-        this._elmts.invertButton.removeClass("facet-mode-inverted");
-    }
-    
-    if (!this._data) {
-        //this._elmts.statusDiv.hide();
-        this._elmts.controlsDiv.hide();
-        this._elmts.bodyInnerDiv.empty().append(
-            $('<div>').text("Loading...").addClass("facet-body-message"));
-            
-        return;
-    } else if ("error" in this._data) {
-        //this._elmts.statusDiv.hide();
-        this._elmts.controlsDiv.hide();
-        this._elmts.bodyInnerDiv.empty().append(
-            $('<div>').text(this._data.error).addClass("facet-body-message"));
-        
-        if (this._data.error == "Too many choices") {
-            this._renderBodyControls();
-        }
-        return;
-    }
-    
-    var scrollTop = 0;
-    if (!resetScroll) {
-        try {
-            scrollTop = this._elmts.bodyInnerDiv[0].scrollTop;
-        } catch (e) {
-        }
-    }
-    
-    this._elmts.bodyInnerDiv.empty();
-    //this._elmts.statusDiv.show();
-    this._elmts.controlsDiv.show();
-    
-    var choices = this._data.choices;
-    var selectionCount = this._selection.length +
-          (this._blankChoice !== null && this._blankChoice.s ? 1 : 0) +
-          (this._errorChoice !== null && this._errorChoice.s ? 1 : 0);
-          
-    this._elmts.choiceCountContainer.text(choices.length + " choices");
-    if (selectionCount > 0) {
-        this._elmts.resetButton.show();
-        this._elmts.invertButton.show();
-    } else {
-        this._elmts.resetButton.hide();
-        this._elmts.invertButton.hide();
-    }
-    
-    if (this._options.sort == "name") {
-        this._elmts.sortByNameLink.removeClass("action").addClass("selected");
-        this._elmts.sortByCountLink.removeClass("selected").addClass("action");
-    } else {
-        this._elmts.sortByNameLink.removeClass("selected").addClass("action");
-        this._elmts.sortByCountLink.removeClass("action").addClass("selected");
-    }
-    
-    var html = [];
-    var temp = $('<div>');
-    var encodeHtml = function(s) {
-        return temp.text(s).html();
-    };
-    
-    var renderEdit = this._config.expression == "value";
-    var renderChoice = function(index, choice, customLabel) {
-        var label = customLabel || choice.v.l;
-        var count = choice.c;
-        
-        html.push('<div class="facet-choice' + (choice.s ? ' facet-choice-selected' : '') + '" choiceIndex="' + index + '">');
-        
-            // include/exclude link
-            html.push(
-                '<a href="javascript:{}" class="facet-choice-link facet-choice-toggle" ' +
-                    'style="visibility: ' + (choice.s ? 'visible' : 'hidden') + '">' + 
-                    (invert != choice.s ? 'exclude' : 'include') + 
-                '</a>'
-            );
-            
-            // edit link
-            if (renderEdit) {
-                html.push('<a href="javascript:{}" class="facet-choice-link facet-choice-edit" style="visibility: hidden">edit</a>');
-            }
-            
-            html.push('<a href="javascript:{}" class="facet-choice-label">' + encodeHtml(label) + '</a>');
-            html.push('<span class="facet-choice-count">' + (invert ? "-" : "") + count + '</span>');
-            
-        html.push('</div>');
-    };
-    for (var i = 0; i < choices.length; i++) {
-        renderChoice(i, choices[i]);
-    }
-    if (this._blankChoice !== null) {
-        renderChoice(-1, this._blankChoice, "(blank)");
-    }
-    if (this._errorChoice !== null) {
-        renderChoice(-2, this._errorChoice, "(error)");
-    }
-    
-    this._elmts.bodyInnerDiv.html(html.join(''));
-    this._renderBodyControls();
-    this._elmts.bodyInnerDiv[0].scrollTop = scrollTop;
-    
-    var getChoice = function(elmt) {
-        var index = parseInt(elmt.attr("choiceIndex"),10);
-        if (index == -1) {
-            return self._blankChoice;
-        } else if (index == -2) {
-            return self._errorChoice;
-        } else {
-            return choices[index];
-        }
-    };
-    var findChoice = function(elmt) {
-        return getChoice(elmt.closest('.facet-choice'));
-    };
-    var select = function(choice) {
-        self._select(choice, false);
-    };
-    var selectOnly = function(choice) {
-        self._select(choice, true);
-    };
-    var deselect = function(choice) {
-        self._deselect(choice);
-    };
-    
-    var wireEvents = function() {
-        var bodyInnerDiv = self._elmts.bodyInnerDiv;
-        bodyInnerDiv.find('.facet-choice-label').click(function() {
-            var choice = findChoice($(this));
-            if (choice.s) {
-                if (selectionCount > 1) {
-                    selectOnly(choice);
-                } else {
-                    deselect(choice);
-                }
-            } else if (selectionCount > 0) {
-                selectOnly(choice);
-            } else {
-                select(choice);
-            }
-        });
-        bodyInnerDiv.find('.facet-choice-edit').click(function() {
-            var choice = findChoice($(this));
-            self._editChoice(choice, $(this).closest('.facet-choice'));
-        });
-        
-        bodyInnerDiv.find('.facet-choice').mouseenter(function() {
-            $(this).find('.facet-choice-edit').css("visibility", "visible");
-            
-            var choice = getChoice($(this));
-            if (!choice.s) {
-                $(this).find('.facet-choice-toggle').css("visibility", "visible");
-            }
-        }).mouseleave(function() {
-            $(this).find('.facet-choice-edit').css("visibility", "hidden");
+  var self = this;
 
-            var choice = getChoice($(this));
-            if (!choice.s) {
-                $(this).find('.facet-choice-toggle').css("visibility", "hidden");
-            }
-        });
-        
-        bodyInnerDiv.find('.facet-choice-toggle').click(function() {
-            var choice = findChoice($(this));
-            if (choice.s) {
-                deselect(choice);
-            } else {
-                select(choice);
-            }
-        });
-    };
-    window.setTimeout(wireEvents, 100);
+  var invert = this._config.invert;
+  if (invert) {
+    this._elmts.bodyInnerDiv.addClass("facet-mode-inverted");
+    this._elmts.invertButton.addClass("facet-mode-inverted");
+  } else {
+    this._elmts.bodyInnerDiv.removeClass("facet-mode-inverted");
+    this._elmts.invertButton.removeClass("facet-mode-inverted");
+  }
+
+  if (!this._data) {
+    //this._elmts.statusDiv.hide();
+    this._elmts.controlsDiv.hide();
+    this._elmts.bodyInnerDiv.empty().append(
+        $('<div>').text("Loading...").addClass("facet-body-message"));
+
+    return;
+  } else if ("error" in this._data) {
+    //this._elmts.statusDiv.hide();
+    this._elmts.controlsDiv.hide();
+
+    if (this._data.error == "Too many choices") {
+      this._elmts.bodyInnerDiv.empty();
+      
+      var messageDiv = $('<div>')
+        .text(this._data.choiceCount + " choices total, too many to display")
+        .addClass("facet-body-message")
+        .appendTo(this._elmts.bodyInnerDiv);
+      $('<br>').appendTo(messageDiv);
+      $('<a>')
+      .text("Set choice count limit")
+      .attr("href", "javascript:{}")
+      .addClass("action")
+      .addClass("secondary")
+      .appendTo(messageDiv)
+      .click(function() {
+        self._setChoiceCountLimit(self._data.choiceCount);
+      });
+      
+      this._renderBodyControls();
+    } else {
+      this._elmts.bodyInnerDiv.empty().append(
+          $('<div>')
+            .text(this._data.error)
+            .addClass("facet-body-message"));
+    }
+    return;
+  }
+
+  var scrollTop = 0;
+  if (!resetScroll) {
+    try {
+      scrollTop = this._elmts.bodyInnerDiv[0].scrollTop;
+    } catch (e) {
+    }
+  }
+
+  this._elmts.bodyInnerDiv.empty();
+  //this._elmts.statusDiv.show();
+  this._elmts.controlsDiv.show();
+
+  var choices = this._data.choices;
+  var selectionCount = this._selection.length +
+  (this._blankChoice !== null && this._blankChoice.s ? 1 : 0) +
+  (this._errorChoice !== null && this._errorChoice.s ? 1 : 0);
+
+  this._elmts.choiceCountContainer.text(choices.length + " choices");
+  if (selectionCount > 0) {
+    this._elmts.resetButton.show();
+    this._elmts.invertButton.show();
+  } else {
+    this._elmts.resetButton.hide();
+    this._elmts.invertButton.hide();
+  }
+
+  if (this._options.sort == "name") {
+    this._elmts.sortByNameLink.removeClass("action").addClass("selected");
+    this._elmts.sortByCountLink.removeClass("selected").addClass("action");
+  } else {
+    this._elmts.sortByNameLink.removeClass("selected").addClass("action");
+    this._elmts.sortByCountLink.removeClass("action").addClass("selected");
+  }
+
+  var html = [];
+  var temp = $('<div>');
+  var encodeHtml = function(s) {
+    return temp.text(s).html();
+  };
+
+  var renderEdit = this._config.expression == "value";
+  var renderChoice = function(index, choice, customLabel) {
+    var label = customLabel || choice.v.l;
+    var count = choice.c;
+
+    html.push('<div class="facet-choice' + (choice.s ? ' facet-choice-selected' : '') + '" choiceIndex="' + index + '">');
+
+    // include/exclude link
+    html.push(
+      '<a href="javascript:{}" class="facet-choice-link facet-choice-toggle" ' +
+        'style="visibility: ' + (choice.s ? 'visible' : 'hidden') + '">' + 
+        (invert != choice.s ? 'exclude' : 'include') + 
+      '</a>'
+    );
+
+    // edit link
+    if (renderEdit) {
+      html.push('<a href="javascript:{}" class="facet-choice-link facet-choice-edit" style="visibility: hidden">edit</a>');
+    }
+
+    html.push('<a href="javascript:{}" class="facet-choice-label">' + encodeHtml(label) + '</a>');
+    html.push('<span class="facet-choice-count">' + (invert ? "-" : "") + count + '</span>');
+
+    html.push('</div>');
+  };
+  for (var i = 0; i < choices.length; i++) {
+    renderChoice(i, choices[i]);
+  }
+  if (this._blankChoice !== null) {
+    renderChoice(-1, this._blankChoice, "(blank)");
+  }
+  if (this._errorChoice !== null) {
+    renderChoice(-2, this._errorChoice, "(error)");
+  }
+
+  this._elmts.bodyInnerDiv.html(html.join(''));
+  this._renderBodyControls();
+  this._elmts.bodyInnerDiv[0].scrollTop = scrollTop;
+
+  var getChoice = function(elmt) {
+    var index = parseInt(elmt.attr("choiceIndex"),10);
+    if (index == -1) {
+      return self._blankChoice;
+    } else if (index == -2) {
+      return self._errorChoice;
+    } else {
+      return choices[index];
+    }
+  };
+  var findChoice = function(elmt) {
+    return getChoice(elmt.closest('.facet-choice'));
+  };
+  var select = function(choice) {
+    self._select(choice, false);
+  };
+  var selectOnly = function(choice) {
+    self._select(choice, true);
+  };
+  var deselect = function(choice) {
+    self._deselect(choice);
+  };
+
+  var wireEvents = function() {
+    var bodyInnerDiv = self._elmts.bodyInnerDiv;
+    bodyInnerDiv.find('.facet-choice-label').click(function() {
+      var choice = findChoice($(this));
+      if (choice.s) {
+        if (selectionCount > 1) {
+          selectOnly(choice);
+        } else {
+          deselect(choice);
+        }
+      } else if (selectionCount > 0) {
+        selectOnly(choice);
+      } else {
+        select(choice);
+      }
+    });
+    bodyInnerDiv.find('.facet-choice-edit').click(function() {
+      var choice = findChoice($(this));
+      self._editChoice(choice, $(this).closest('.facet-choice'));
+    });
+
+    bodyInnerDiv.find('.facet-choice').mouseenter(function() {
+      $(this).find('.facet-choice-edit').css("visibility", "visible");
+
+      var choice = getChoice($(this));
+      if (!choice.s) {
+        $(this).find('.facet-choice-toggle').css("visibility", "visible");
+      }
+    }).mouseleave(function() {
+      $(this).find('.facet-choice-edit').css("visibility", "hidden");
+
+      var choice = getChoice($(this));
+      if (!choice.s) {
+        $(this).find('.facet-choice-toggle').css("visibility", "hidden");
+      }
+    });
+
+    bodyInnerDiv.find('.facet-choice-toggle').click(function() {
+      var choice = findChoice($(this));
+      if (choice.s) {
+        deselect(choice);
+      } else {
+        select(choice);
+      }
+    });
+  };
+  window.setTimeout(wireEvents, 100);
 };
 
 ListFacet.prototype._renderBodyControls = function() {
-    var self = this;
-    var bodyControls = $('<div>')
-        .addClass("facet-body-controls")
-        .appendTo(this._elmts.bodyInnerDiv);
-        
-    $('<a>')
-        .text("Facet by choice counts")
-        .attr("href", "javascript:{}")
-        .addClass("action")
-        .addClass("secondary")
-        .appendTo(bodyControls)
-        .click(function() {
-            ui.browsingEngine.addFacet(
-                "range", 
-                {
-                    "name" : self._config.columnName,
-                    "columnName" : self._config.columnName, 
-                    "expression" : self._getMetaExpression(),
-                    "mode" : "range"
-                },
-                {
-                }
-            );
-        });
+  var self = this;
+  var bodyControls = $('<div>')
+  .addClass("facet-body-controls")
+  .appendTo(this._elmts.bodyInnerDiv);
+
+  $('<a>')
+  .text("Facet by choice counts")
+  .attr("href", "javascript:{}")
+  .addClass("action")
+  .addClass("secondary")
+  .appendTo(bodyControls)
+  .click(function() {
+    ui.browsingEngine.addFacet(
+      "range", 
+      {
+        "name" : self._config.columnName,
+        "columnName" : self._config.columnName, 
+        "expression" : self._getMetaExpression(),
+        "mode" : "range"
+      },
+      {
+      }
+    );
+  });
 };
 
 ListFacet.prototype._getMetaExpression = function() {
-    var r = Scripting.parse(this._config.expression);
-    
-    return r.language + ':facetCount(' + [
+  var r = Scripting.parse(this._config.expression);
+
+  return r.language + ':facetCount(' + [
         r.expression,
         JSON.stringify(this._config.expression),
         JSON.stringify(this._config.columnName)
-    ].join(', ') + ')';
+      ].join(', ') + ')';
 }
 
 ListFacet.prototype._doEdit = function() {
-    new ClusteringDialog(this._config.columnName, this._config.expression);
+  new ClusteringDialog(this._config.columnName, this._config.expression);
 };
 
 ListFacet.prototype._editChoice = function(choice, choiceDiv) {
-    var self = this;
-    
-    var menu = MenuSystem.createMenu().addClass("data-table-cell-editor").width("400px");
-    menu.html(
-              '<textarea class="data-table-cell-editor-editor" bind="textarea" />' +
-              '<div id="data-table-cell-editor-actions">' +
-                '<div class="data-table-cell-editor-action">' +
-                  '<button class="button" bind="okButton">Apply</button>' +
-                  '<div class="data-table-cell-editor-key">Enter</div>' +
-                '</div>' +
-                '<div class="data-table-cell-editor-action">' +
-                  '<button class="button" bind="cancelButton">Cancel</button>' +
-                    '<div class="data-table-cell-editor-key">Esc</div>' +
-                '</div>' +
-              '</div>'
-    );
-    var elmts = DOM.bind(menu);
-    
-    MenuSystem.showMenu(menu, function(){});
-    MenuSystem.positionMenuLeftRight(menu, choiceDiv);
-    
-    var originalContent;
-    if (choice === this._blankChoice) {
-        originalContent = "(blank)";
-    } else if (choice === this._errorChoice) {
-        originalContent = "(error)";
+  var self = this;
+
+  var menu = MenuSystem.createMenu().addClass("data-table-cell-editor").width("400px");
+  menu.html(
+      '<textarea class="data-table-cell-editor-editor" bind="textarea" />' +
+      '<div id="data-table-cell-editor-actions">' +
+        '<div class="data-table-cell-editor-action">' +
+          '<button class="button" bind="okButton">Apply</button>' +
+          '<div class="data-table-cell-editor-key">Enter</div>' +
+        '</div>' +
+        '<div class="data-table-cell-editor-action">' +
+          '<button class="button" bind="cancelButton">Cancel</button>' +
+          '<div class="data-table-cell-editor-key">Esc</div>' +
+        '</div>' +
+      '</div>'
+  );
+  var elmts = DOM.bind(menu);
+
+  MenuSystem.showMenu(menu, function(){});
+  MenuSystem.positionMenuLeftRight(menu, choiceDiv);
+
+  var originalContent;
+  if (choice === this._blankChoice) {
+    originalContent = "(blank)";
+  } else if (choice === this._errorChoice) {
+    originalContent = "(error)";
+  } else {
+    originalContent = choice.v.v;
+  }
+
+  var commit = function() {
+    var text = elmts.textarea[0].value;
+
+    MenuSystem.dismissAll();
+
+    var edit = { to : text };
+    if (choice === self._blankChoice) {
+      edit.fromBlank = true;
+    } else if (choice === self._errorChoice) {
+      edit.fromError = true;
     } else {
-        originalContent = choice.v.v;
+      edit.from = [ originalContent ];
     }
-    
-    var commit = function() {
-        var text = elmts.textarea[0].value;
-        
-        MenuSystem.dismissAll();
-        
-        var edit = { to : text };
-        if (choice === self._blankChoice) {
-            edit.fromBlank = true;
-        } else if (choice === self._errorChoice) {
-            edit.fromError = true;
-        } else {
-            edit.from = [ originalContent ];
+
+    Refine.postCoreProcess(
+      "mass-edit",
+      {},
+      {
+        columnName: self._config.columnName,
+        expression: "value",
+        edits: JSON.stringify([ edit ])
+      },
+      {
+        // limit edits to rows constrained only by the other facets
+        engineConfig: ui.browsingEngine.getJSON(false, self),
+        cellsChanged: true
+      },
+      {
+        onDone: function(o) {
+          var selection = [];
+          var gotSelection = false;
+          for (var i = 0; i < self._selection.length; i++) {
+            var choice = self._selection[i];
+            if (choice.v.v == originalContent) {
+              if (gotSelection) {
+                continue;
+              }
+              choice.v.v = text;
+              gotSelection = true; // eliminate duplicated selections due to changing one selected choice to another
+            }
+            selection.push(choice);
+          }
+          self._selection = selection;
         }
-        
-        Refine.postCoreProcess(
-            "mass-edit",
-            {},
-            {
-                columnName: self._config.columnName,
-                expression: "value",
-                edits: JSON.stringify([ edit ])
-            },
-            {
-                // limit edits to rows constrained only by the other facets
-                engineConfig: ui.browsingEngine.getJSON(false, self),
-                cellsChanged: true
-            },
-            {
-                onDone: function(o) {
-                    var selection = [];
-                    var gotSelection = false;
-                    for (var i = 0; i < self._selection.length; i++) {
-                        var choice = self._selection[i];
-                        if (choice.v.v == originalContent) {
-                            if (gotSelection) {
-                                continue;
-                            }
-                            choice.v.v = text;
-                            gotSelection = true; // eliminate duplicated selections due to changing one selected choice to another
-                        }
-                        selection.push(choice);
-                    }
-                    self._selection = selection;
-                }
-            }
-        );            
-    };
-    
-    elmts.okButton.click(commit);
-    elmts.textarea
-        .text(originalContent)
-        .keydown(function(evt) {
-            if (!evt.shiftKey) {
-                if (evt.keyCode == 13) {
-                    commit();
-                } else if (evt.keyCode == 27) {
-                    MenuSystem.dismissAll();
-                }
-            }
-        })
-        .select()
-        .focus();
-        
-    elmts.cancelButton.click(function() {
+      }
+    );            
+  };
+
+  elmts.okButton.click(commit);
+  elmts.textarea
+  .text(originalContent)
+  .keydown(function(evt) {
+    if (!evt.shiftKey) {
+      if (evt.keyCode == 13) {
+        commit();
+      } else if (evt.keyCode == 27) {
         MenuSystem.dismissAll();
-    });
+      }
+    }
+  })
+  .select()
+  .focus();
+
+  elmts.cancelButton.click(function() {
+    MenuSystem.dismissAll();
+  });
 };
 
 ListFacet.prototype._select = function(choice, only) {
-    if (only) {
-        this._selection = [];
-        if (this._blankChoice !== null) {
-            this._blankChoice.s = false;
-        }
-        if (this._errorChoice !== null) {
-            this._errorChoice.s = false;
-        }
+  if (only) {
+    this._selection = [];
+    if (this._blankChoice !== null) {
+      this._blankChoice.s = false;
     }
-    
-    choice.s = true;
-    if (choice !== this._errorChoice && choice !== this._blankChoice) {
-        this._selection.push(choice);
+    if (this._errorChoice !== null) {
+      this._errorChoice.s = false;
     }
-    
-    this._updateRest();
+  }
+
+  choice.s = true;
+  if (choice !== this._errorChoice && choice !== this._blankChoice) {
+    this._selection.push(choice);
+  }
+
+  this._updateRest();
 };
 
 ListFacet.prototype._deselect = function(choice) {
-    if (choice === this._errorChoice || choice === this._blankChoice) {
-        choice.s = false;
-    } else {
-        for (var i = this._selection.length - 1; i >= 0; i--) {
-            if (this._selection[i] === choice) {
-                this._selection.splice(i, 1);
-                break;
-            }
-        }
+  if (choice === this._errorChoice || choice === this._blankChoice) {
+    choice.s = false;
+  } else {
+    for (var i = this._selection.length - 1; i >= 0; i--) {
+      if (this._selection[i] === choice) {
+        this._selection.splice(i, 1);
+        break;
+      }
     }
-    this._updateRest();
+  }
+  this._updateRest();
 };
 
 ListFacet.prototype._reset = function() {
-    this._selection = [];
-    this._blankChoice = null;
-    this._errorChoice = null;
-    this._config.invert = false;
-    
-    this._updateRest();
+  this._selection = [];
+  this._blankChoice = null;
+  this._errorChoice = null;
+  this._config.invert = false;
+
+  this._updateRest();
 };
 
 ListFacet.prototype._invert = function() {
-    this._config.invert = !this._config.invert;
-    
-    this._updateRest();
+  this._config.invert = !this._config.invert;
+
+  this._updateRest();
 };
 
 ListFacet.prototype._remove = function() {
-    ui.browsingEngine.removeFacet(this);
-    
-    this._div = null;
-    this._config = null;
-    
-    this._selection = null;
-    this._blankChoice = null;
-    this._errorChoice = null;
-    this._data = null;
+  ui.browsingEngine.removeFacet(this);
+
+  this._div = null;
+  this._config = null;
+
+  this._selection = null;
+  this._blankChoice = null;
+  this._errorChoice = null;
+  this._data = null;
 };
 
 ListFacet.prototype._updateRest = function() {
-    Refine.update({ engineChanged: true });
+  Refine.update({ engineChanged: true });
 };
 
 ListFacet.prototype._editExpression = function() {
-    var self = this;
-    var title = (this._config.columnName) ? 
-            ("Edit Facet's Expression based on Column " + this._config.columnName) : 
-            "Edit Facet's Expression";
-    
-    var column = Refine.columnNameToColumn(this._config.columnName);
-    var o = DataTableView.sampleVisibleRows(column);
-    
-    new ExpressionPreviewDialog(
-        title,
-        column ? column.cellIndex : -1, 
-        o.rowIndices,
-        o.values,
-        this._config.expression, 
-        function(expr) {
-            if (expr != self._config.expression) {
-                self._config.expression = expr;
-                
-                self._elmts.expressionDiv.text(self._config.expression);
-                if (self._config.expression == "value" || self._config.expression == "grel:value") {
-                    self._elmts.clusterLink.show();
-                } else {
-                    self._elmts.clusterLink.hide();
-                }
-                
-                self.reset();
-                self._updateRest();
-            }
+  var self = this;
+  var title = (this._config.columnName) ? 
+      ("Edit Facet's Expression based on Column " + this._config.columnName) : 
+        "Edit Facet's Expression";
+
+  var column = Refine.columnNameToColumn(this._config.columnName);
+  var o = DataTableView.sampleVisibleRows(column);
+
+  new ExpressionPreviewDialog(
+    title,
+    column ? column.cellIndex : -1, 
+    o.rowIndices,
+    o.values,
+    this._config.expression, 
+    function(expr) {
+      if (expr != self._config.expression) {
+        self._config.expression = expr;
+
+        self._elmts.expressionDiv.text(self._config.expression);
+        if (self._config.expression == "value" || self._config.expression == "grel:value") {
+          self._elmts.clusterLink.show();
+        } else {
+          self._elmts.clusterLink.hide();
         }
-    );
-};
\ No newline at end of file
+
+        self.reset();
+        self._updateRest();
+      }
+    }
+  );
+};
+
+ListFacet.prototype._setChoiceCountLimit = function(choiceCount) {
+  var limit = Math.ceil(choiceCount / 1000) * 1000;
+  var s = window.prompt('Set the maximum number of choices shown in each text facet (too many will slow down the application)', limit);
+  if (s) {
+    var n = parseInt(s);
+
+    if (!isNaN(n)) {
+      var self = this;
+      $.post(
+        "/command/core/set-preference",
+        {
+          name : "ui.browsing.listFacet.limit",
+          value : n
+        },
+        function(o) {
+          if (o.code == "ok") {
+            ui.browsingEngine.update();
+          } else if (o.code == "error") {
+            alert(o.message);
+          }
+        },
+        "json"
+      );      
+    }
+  }
+};
diff --git a/main/webapp/modules/core/scripts/facets/range-facet.js b/main/webapp/modules/core/scripts/facets/range-facet.js
index f7ff6de1c..22497b54c 100644
--- a/main/webapp/modules/core/scripts/facets/range-facet.js
+++ b/main/webapp/modules/core/scripts/facets/range-facet.js
@@ -7,13 +7,13 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-    * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -29,374 +29,374 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-*/
+ */
 
 function RangeFacet(div, config, options) {
-    this._div = div;
-    this._config = config;
-    this._options = options;
-    
-    this._from = ("from" in this._config) ? this._config.from : null;
-    this._to = ("to" in this._config) ? this._config.to : null;
-    
-    this._selectNumeric = ("selectNumeric" in this._config) ? this._config.selectNumeric : true;
-    this._selectNonNumeric = ("selectNonNumeric" in this._config) ? this._config.selectNonNumeric : true;
-    this._selectBlank = ("selectBlank" in this._config) ? this._config.selectBlank : true;
-    this._selectError = ("selectError" in this._config) ? this._config.selectError : true;
-    
-    this._baseNumericCount = 0;
-    this._baseNonNumericCount = 0;
-    this._baseBlankCount = 0;
-    this._baseErrorCount = 0;
-    
-    this._numericCount = 0;
-    this._nonNumericCount = 0;
-    this._blankCount = 0;
-    this._errorCount = 0;
-    
-    this._error = false;
-    this._initializedUI = false;
+  this._div = div;
+  this._config = config;
+  this._options = options;
+
+  this._from = ("from" in this._config) ? this._config.from : null;
+  this._to = ("to" in this._config) ? this._config.to : null;
+
+  this._selectNumeric = ("selectNumeric" in this._config) ? this._config.selectNumeric : true;
+  this._selectNonNumeric = ("selectNonNumeric" in this._config) ? this._config.selectNonNumeric : true;
+  this._selectBlank = ("selectBlank" in this._config) ? this._config.selectBlank : true;
+  this._selectError = ("selectError" in this._config) ? this._config.selectError : true;
+
+  this._baseNumericCount = 0;
+  this._baseNonNumericCount = 0;
+  this._baseBlankCount = 0;
+  this._baseErrorCount = 0;
+
+  this._numericCount = 0;
+  this._nonNumericCount = 0;
+  this._blankCount = 0;
+  this._errorCount = 0;
+
+  this._error = false;
+  this._initializedUI = false;
 }
 
 RangeFacet.prototype.reset = function() {
-    this._from = this._config.min;
-    this._to = this._config.max;
-    this._sliderWidget.update(
-        this._config.min, 
-        this._config.max, 
-        this._config.step, 
-        this._from,
-        this._to
-    );
-        
-    this._selectNumeric = true;
-    this._selectNonNumeric = true;
-    this._selectBlank = true;
-    this._selectError = true;
-    
-    this._setRangeIndicators();
+  this._from = this._config.min;
+  this._to = this._config.max;
+  this._sliderWidget.update(
+      this._config.min, 
+      this._config.max, 
+      this._config.step, 
+      this._from,
+      this._to
+  );
+
+  this._selectNumeric = true;
+  this._selectNonNumeric = true;
+  this._selectBlank = true;
+  this._selectError = true;
+
+  this._setRangeIndicators();
 };
 
 RangeFacet.reconstruct = function(div, uiState) {
-    return new RangeFacet(div, uiState.c, uiState.o);
+  return new RangeFacet(div, uiState.c, uiState.o);
 };
 
 RangeFacet.prototype.dispose = function() {
 };
 
 RangeFacet.prototype.getUIState = function() {
-    var json = {
-        c: this.getJSON(),
-        o: this._options
-    };
-    
-    return json;
+  var json = {
+      c: this.getJSON(),
+      o: this._options
+  };
+
+  return json;
 };
 
 RangeFacet.prototype.getJSON = function() {
-    var o = {
-        type: "range",
-        name: this._config.name,
-        expression: this._config.expression,
-        columnName: this._config.columnName,
-        selectNumeric: this._selectNumeric,
-        selectNonNumeric: this._selectNonNumeric,
-        selectBlank: this._selectBlank,
-        selectError: this._selectError
-    };
-    
-    if (this._from !== null) {
-        o.from = this._from;
-    }
-    if (this._to !== null) {
-        o.to = this._to;
-    }
-    
-    return o;
+  var o = {
+      type: "range",
+      name: this._config.name,
+      expression: this._config.expression,
+      columnName: this._config.columnName,
+      selectNumeric: this._selectNumeric,
+      selectNonNumeric: this._selectNonNumeric,
+      selectBlank: this._selectBlank,
+      selectError: this._selectError
+  };
+
+  if (this._from !== null) {
+    o.from = this._from;
+  }
+  if (this._to !== null) {
+    o.to = this._to;
+  }
+
+  return o;
 };
 
 RangeFacet.prototype.hasSelection = function() {
-    if (!this._selectNumeric || !this._selectNonNumeric || !this._selectBlank || !this._selectError) {
-        return true;
-    }
-    
-    return (this._from !== null && (!this._initializedUI || this._from > this._config.min)) ||
-        (this._to !== null && (!this._initializedUI || this._to < this._config.max));
+  if (!this._selectNumeric || !this._selectNonNumeric || !this._selectBlank || !this._selectError) {
+    return true;
+  }
+
+  return (this._from !== null && (!this._initializedUI || this._from > this._config.min)) ||
+  (this._to !== null && (!this._initializedUI || this._to < this._config.max));
 };
 
 RangeFacet.prototype._initializeUI = function() {
-    var self = this;
-    this._div
-        .empty()
-        .show()
-        .html(
-            '<div class="facet-title" bind="headerDiv">' +
-                '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
-                    '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
-                    '<td>' +
-                        '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
-                        '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">change</a>' +
-                        '<span bind="facetTitle"></span>' +
-                    '</td>' +
-                '</tr></table></div>' +
-            '</div>' +
-            '<div class="facet-expression" bind="expressionDiv" title="Click to edit expression"></div>' +
-            '<div class="facet-range-body">' +
-                '<div class="facet-range-message" bind="messageDiv">Loading...</div>' +
-                '<div class="facet-range-slider" bind="sliderWidgetDiv">' +
-                    '<div class="facet-range-histogram" bind="histogramDiv"></div>' +
-                '</div>' +
-                '<div class="facet-range-status" bind="statusDiv"></div>' +
-                '<div class="facet-range-other-choices" bind="otherChoicesDiv"></div>' +
-            '</div>'
-        );
-    this._elmts = DOM.bind(this._div);
-    
-    this._elmts.facetTitle.text(this._config.name);
-    this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
-        self._elmts.expressionDiv.slideToggle(100, function() {
-            if (self._elmts.expressionDiv.css("display") != "none") {
-                self._editExpression();
-            }
-        });
-    });
-    this._elmts.expressionDiv.text(this._config.expression).click(function() { 
-        self._editExpression(); 
-    }).hide();
-    
-    this._elmts.resetButton.click(function() {
-        self.reset();
-        self._updateRest();
-    });
-    this._elmts.removeButton.click(function() {
-        self._remove();
-    });
-        
-    this._histogram = new HistogramWidget(this._elmts.histogramDiv, { binColors: [ "#bbccff", "#88aaee" ] });
-    this._sliderWidget = new SliderWidget(this._elmts.sliderWidgetDiv);
-    
-    this._elmts.sliderWidgetDiv.bind("slide", function(evt, data) {
-        self._from = data.from;
-        self._to = data.to;
-        self._setRangeIndicators();
-    }).bind("stop", function(evt, data) {
-        self._from = data.from;
-        self._to = data.to;
-        self._selectNumeric = true;
-        self._updateRest();
+  var self = this;
+  this._div
+  .empty()
+  .show()
+  .html(
+      '<div class="facet-title" bind="headerDiv">' +
+      '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
+      '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
+      '<td>' +
+      '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
+      '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">change</a>' +
+      '<span bind="facetTitle"></span>' +
+      '</td>' +
+      '</tr></table></div>' +
+      '</div>' +
+      '<div class="facet-expression" bind="expressionDiv" title="Click to edit expression"></div>' +
+      '<div class="facet-range-body">' +
+      '<div class="facet-range-message" bind="messageDiv">Loading...</div>' +
+      '<div class="facet-range-slider" bind="sliderWidgetDiv">' +
+      '<div class="facet-range-histogram" bind="histogramDiv"></div>' +
+      '</div>' +
+      '<div class="facet-range-status" bind="statusDiv"></div>' +
+      '<div class="facet-range-other-choices" bind="otherChoicesDiv"></div>' +
+      '</div>'
+  );
+  this._elmts = DOM.bind(this._div);
+
+  this._elmts.facetTitle.text(this._config.name);
+  this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
+    self._elmts.expressionDiv.slideToggle(100, function() {
+      if (self._elmts.expressionDiv.css("display") != "none") {
+        self._editExpression();
+      }
     });
+  });
+  this._elmts.expressionDiv.text(this._config.expression).click(function() { 
+    self._editExpression(); 
+  }).hide();
+
+  this._elmts.resetButton.click(function() {
+    self.reset();
+    self._updateRest();
+  });
+  this._elmts.removeButton.click(function() {
+    self._remove();
+  });
+
+  this._histogram = new HistogramWidget(this._elmts.histogramDiv, { binColors: [ "#bbccff", "#88aaee" ] });
+  this._sliderWidget = new SliderWidget(this._elmts.sliderWidgetDiv);
+
+  this._elmts.sliderWidgetDiv.bind("slide", function(evt, data) {
+    self._from = data.from;
+    self._to = data.to;
+    self._setRangeIndicators();
+  }).bind("stop", function(evt, data) {
+    self._from = data.from;
+    self._to = data.to;
+    self._selectNumeric = true;
+    self._updateRest();
+  });
 };
 
 RangeFacet.prototype._renderOtherChoices = function() {
-    var self = this;
-    var container = this._elmts.otherChoicesDiv.empty();
-    
-    if (this._baseNonNumericCount === 0 && this._baseBlankCount === 0 && this._baseErrorCount === 0) {
-        return;
-    }
+  var self = this;
+  var container = this._elmts.otherChoicesDiv.empty();
 
-    var facet_id = this._div.attr("id");
-    
-    var choices = $('<div>').addClass("facet-range-choices");
+  if (this._baseNonNumericCount === 0 && this._baseBlankCount === 0 && this._baseErrorCount === 0) {
+    return;
+  }
 
-    // ----------------- numeric -----------------
-    
-    var numericDiv = $('<div class="facet-range-item"></div>').appendTo(choices);
-    var numericCheck = $('<input type="checkbox" />').attr("id",facet_id + "-numeric").appendTo(numericDiv).change(function() {
-        self._selectNumeric = !self._selectNumeric;
-        self._updateRest();
-    });
-    if (this._selectNumeric) numericCheck.attr("checked","checked");
-    
-    var numericLabel = $('<label>').attr("for", facet_id + "-numeric").appendTo(numericDiv);    
-    $('<span>').text("Numeric ").addClass("facet-range-choice-label").appendTo(numericLabel);
-    $('<div>').text(this._numericCount).addClass("facet-range-choice-count").appendTo(numericLabel);
+  var facet_id = this._div.attr("id");
 
-    // ----------------- non-numeric -----------------
+  var choices = $('<div>').addClass("facet-range-choices");
 
-    var nonNumericDiv = $('<div class="facet-range-item"></div>').appendTo(choices);    
-    var nonNumericCheck = $('<input type="checkbox" />').attr("id",facet_id + "-non-numeric").appendTo(nonNumericDiv).change(function() {
-        self._selectNonNumeric = !self._selectNonNumeric;
-        self._updateRest();
-    });
-    if (this._selectNonNumeric) nonNumericCheck.attr("checked","checked");
-    
-    var nonNumericLabel = $('<label>').attr("for", facet_id + "-non-numeric").appendTo(nonNumericDiv);    
-    $('<span>').text("Non-numeric ").addClass("facet-range-choice-label").appendTo(nonNumericLabel);
-    $('<div>').text(this._nonNumericCount).addClass("facet-range-choice-count").appendTo(nonNumericLabel);
+  // ----------------- numeric -----------------
 
-    if (this._baseNonNumericCount === 0) nonNumericCheck.removeAttr("checked");
-    
-    // ----------------- blank -----------------
+  var numericDiv = $('<div class="facet-range-item"></div>').appendTo(choices);
+  var numericCheck = $('<input type="checkbox" />').attr("id",facet_id + "-numeric").appendTo(numericDiv).change(function() {
+    self._selectNumeric = !self._selectNumeric;
+    self._updateRest();
+  });
+  if (this._selectNumeric) numericCheck.attr("checked","checked");
 
-    var blankDiv = $('<div class="facet-range-item"></div>').appendTo(choices);        
-    var blankCheck = $('<input type="checkbox" />').attr("id",facet_id + "-blank").appendTo(blankDiv).change(function() {
-        self._selectBlank = !self._selectBlank;
-        self._updateRest();
-    });
-    if (this._selectBlank) blankCheck.attr("checked","checked");
+  var numericLabel = $('<label>').attr("for", facet_id + "-numeric").appendTo(numericDiv);    
+  $('<span>').text("Numeric ").addClass("facet-range-choice-label").appendTo(numericLabel);
+  $('<div>').text(this._numericCount).addClass("facet-range-choice-count").appendTo(numericLabel);
 
-    var blankLabel = $('<label>').attr("for", facet_id + "-blank").appendTo(blankDiv);    
-    $('<span>').text("Blank ").addClass("facet-range-choice-label").appendTo(blankLabel);
-    $('<div>').text(this._blankCount).addClass("facet-range-choice-count").appendTo(blankLabel);
+  // ----------------- non-numeric -----------------
 
-    if (this._baseBlankCount === 0) blankCheck.removeAttr("checked");
-    
-    // ----------------- error -----------------
+  var nonNumericDiv = $('<div class="facet-range-item"></div>').appendTo(choices);    
+  var nonNumericCheck = $('<input type="checkbox" />').attr("id",facet_id + "-non-numeric").appendTo(nonNumericDiv).change(function() {
+    self._selectNonNumeric = !self._selectNonNumeric;
+    self._updateRest();
+  });
+  if (this._selectNonNumeric) nonNumericCheck.attr("checked","checked");
 
-    var errorDiv = $('<div class="facet-range-item"></div>').appendTo(choices);
-    var errorCheck = $('<input type="checkbox" />').attr("id",facet_id + "-error").appendTo(errorDiv).change(function() {
-        self._selectError = !self._selectError;
-        self._updateRest();
-    });
-    if (this._selectError) errorCheck.attr("checked","checked");
+  var nonNumericLabel = $('<label>').attr("for", facet_id + "-non-numeric").appendTo(nonNumericDiv);    
+  $('<span>').text("Non-numeric ").addClass("facet-range-choice-label").appendTo(nonNumericLabel);
+  $('<div>').text(this._nonNumericCount).addClass("facet-range-choice-count").appendTo(nonNumericLabel);
 
-    var errorLabel = $('<label>').attr("for", facet_id + "-error").appendTo(errorDiv);    
-    $('<span>').text("Error ").addClass("facet-range-choice-label").appendTo(errorLabel);
-    $('<div>').text(this._errorCount).addClass("facet-range-choice-count").appendTo(errorLabel);
+  if (this._baseNonNumericCount === 0) nonNumericCheck.removeAttr("checked");
 
-    if (this._baseErrorCount === 0) errorCheck.removeAttr("checked");
+  // ----------------- blank -----------------
 
-    // --------------------------
-    
-    choices.appendTo(container);
+  var blankDiv = $('<div class="facet-range-item"></div>').appendTo(choices);        
+  var blankCheck = $('<input type="checkbox" />').attr("id",facet_id + "-blank").appendTo(blankDiv).change(function() {
+    self._selectBlank = !self._selectBlank;
+    self._updateRest();
+  });
+  if (this._selectBlank) blankCheck.attr("checked","checked");
+
+  var blankLabel = $('<label>').attr("for", facet_id + "-blank").appendTo(blankDiv);    
+  $('<span>').text("Blank ").addClass("facet-range-choice-label").appendTo(blankLabel);
+  $('<div>').text(this._blankCount).addClass("facet-range-choice-count").appendTo(blankLabel);
+
+  if (this._baseBlankCount === 0) blankCheck.removeAttr("checked");
+
+  // ----------------- error -----------------
+
+  var errorDiv = $('<div class="facet-range-item"></div>').appendTo(choices);
+  var errorCheck = $('<input type="checkbox" />').attr("id",facet_id + "-error").appendTo(errorDiv).change(function() {
+    self._selectError = !self._selectError;
+    self._updateRest();
+  });
+  if (this._selectError) errorCheck.attr("checked","checked");
+
+  var errorLabel = $('<label>').attr("for", facet_id + "-error").appendTo(errorDiv);    
+  $('<span>').text("Error ").addClass("facet-range-choice-label").appendTo(errorLabel);
+  $('<div>').text(this._errorCount).addClass("facet-range-choice-count").appendTo(errorLabel);
+
+  if (this._baseErrorCount === 0) errorCheck.removeAttr("checked");
+
+  // --------------------------
+
+  choices.appendTo(container);
 };
 
 RangeFacet.prototype._setRangeIndicators = function() {
-    this._elmts.statusDiv.html(this._addCommas(this._from.toFixed(2)) + " &mdash; " + this._addCommas(this._to.toFixed(2)));
+  this._elmts.statusDiv.html(this._addCommas(this._from.toFixed(2)) + " &mdash; " + this._addCommas(this._to.toFixed(2)));
 };
 
 RangeFacet.prototype._addCommas = function(nStr) {
-    nStr += '';
-    x = nStr.split('.');
-    x1 = x[0];
-    x2 = x.length > 1 ? '.' + x[1] : '';
-    var rgx = /(\d+)(\d{3})/;
-    while (rgx.test(x1)) {
-        x1 = x1.replace(rgx, '$1' + ',' + '$2');
-    }
-    return x1 + x2;
+  nStr += '';
+  x = nStr.split('.');
+  x1 = x[0];
+  x2 = x.length > 1 ? '.' + x[1] : '';
+  var rgx = /(\d+)(\d{3})/;
+  while (rgx.test(x1)) {
+    x1 = x1.replace(rgx, '$1' + ',' + '$2');
+  }
+  return x1 + x2;
 };
 
 RangeFacet.prototype.updateState = function(data) {
-    if ("min" in data && "max" in data) {
-        this._error = false;
-        
-        this._config.min = data.min;
-        this._config.max = data.max;
-        this._config.step = data.step;
-        this._baseBins = data.baseBins;
-        this._bins = data.bins;
-        
-        switch (this._config.mode) {
-        case "min":
-            this._from = Math.max(data.from, this._config.min);
-            break;
-        case "max":
-            this._to = Math.min(data.to, this._config.max);
-            break;
-        default:
-            this._from = Math.max(data.from, this._config.min);
-            if ("to" in data) {
-                this._to = Math.min(data.to, this._config.max);
-            } else {
-                this._to = data.max;
-            }
-        }
-        
-        this._baseNumericCount = data.baseNumericCount;
-        this._baseNonNumericCount = data.baseNonNumericCount;
-        this._baseBlankCount = data.baseBlankCount;
-        this._baseErrorCount = data.baseErrorCount;
+  if ("min" in data && "max" in data) {
+    this._error = false;
 
-        this._numericCount = data.numericCount;
-        this._nonNumericCount = data.nonNumericCount;
-        this._blankCount = data.blankCount;
-        this._errorCount = data.errorCount;
+    this._config.min = data.min;
+    this._config.max = data.max;
+    this._config.step = data.step;
+    this._baseBins = data.baseBins;
+    this._bins = data.bins;
+
+    switch (this._config.mode) {
+    case "min":
+      this._from = Math.max(data.from, this._config.min);
+      break;
+    case "max":
+      this._to = Math.min(data.to, this._config.max);
+      break;
+    default:
+      this._from = Math.max(data.from, this._config.min);
+    if ("to" in data) {
+      this._to = Math.min(data.to, this._config.max);
     } else {
-        this._error = true;
-        this._errorMessage = "error" in data ? data.error : "Unknown error.";
+      this._to = data.max;
     }
-    
-    this.render();
+    }
+
+    this._baseNumericCount = data.baseNumericCount;
+    this._baseNonNumericCount = data.baseNonNumericCount;
+    this._baseBlankCount = data.baseBlankCount;
+    this._baseErrorCount = data.baseErrorCount;
+
+    this._numericCount = data.numericCount;
+    this._nonNumericCount = data.nonNumericCount;
+    this._blankCount = data.blankCount;
+    this._errorCount = data.errorCount;
+  } else {
+    this._error = true;
+    this._errorMessage = "error" in data ? data.error : "Unknown error.";
+  }
+
+  this.render();
 };
 
 RangeFacet.prototype.render = function() {
-    if (!this._initializedUI) {
-        this._initializeUI();
-        this._initializedUI = true;
-    }
-    
-    if (this._error) {
-        this._elmts.messageDiv.text(this._errorMessage).show();
-        this._elmts.sliderWidgetDiv.hide();
-        this._elmts.histogramDiv.hide();
-        this._elmts.statusDiv.hide();
-        this._elmts.otherChoicesDiv.hide();
-        return;
-    }
-    
-    this._elmts.messageDiv.hide();
-    this._elmts.sliderWidgetDiv.show();
-    this._elmts.histogramDiv.show();
-    this._elmts.statusDiv.show();
-    this._elmts.otherChoicesDiv.show();
-    
-    this._sliderWidget.update(
-        this._config.min, 
-        this._config.max, 
-        this._config.step, 
-        this._from,
-        this._to
-    );
-    this._histogram.update(
-        this._config.min, 
-        this._config.max, 
-        this._config.step, 
-        [ this._baseBins, this._bins ]
-    );
-    
-    this._setRangeIndicators();
-    this._renderOtherChoices();
+  if (!this._initializedUI) {
+    this._initializeUI();
+    this._initializedUI = true;
+  }
+
+  if (this._error) {
+    this._elmts.messageDiv.text(this._errorMessage).show();
+    this._elmts.sliderWidgetDiv.hide();
+    this._elmts.histogramDiv.hide();
+    this._elmts.statusDiv.hide();
+    this._elmts.otherChoicesDiv.hide();
+    return;
+  }
+
+  this._elmts.messageDiv.hide();
+  this._elmts.sliderWidgetDiv.show();
+  this._elmts.histogramDiv.show();
+  this._elmts.statusDiv.show();
+  this._elmts.otherChoicesDiv.show();
+
+  this._sliderWidget.update(
+      this._config.min, 
+      this._config.max, 
+      this._config.step, 
+      this._from,
+      this._to
+  );
+  this._histogram.update(
+      this._config.min, 
+      this._config.max, 
+      this._config.step, 
+      [ this._baseBins, this._bins ]
+  );
+
+  this._setRangeIndicators();
+  this._renderOtherChoices();
 };
 
 RangeFacet.prototype._remove = function() {
-    ui.browsingEngine.removeFacet(this);
-    
-    this._div = null;
-    this._config = null;
-    this._data = null;
+  ui.browsingEngine.removeFacet(this);
+
+  this._div = null;
+  this._config = null;
+  this._data = null;
 };
 
 RangeFacet.prototype._updateRest = function() {
-    Refine.update({ engineChanged: true });
+  Refine.update({ engineChanged: true });
 };
 
 RangeFacet.prototype._editExpression = function() {
-    var self = this;
-    var title = (this._config.columnName) ? 
-            ("Edit Facet's Expression based on Column " + this._config.columnName) : 
-            "Edit Facet's Expression";
-    
-    var column = Refine.columnNameToColumn(this._config.columnName);
-    var o = DataTableView.sampleVisibleRows(column);
-    
-    new ExpressionPreviewDialog(
-        title,
-        column ? column.cellIndex : -1, 
-        o.rowIndices,
-        o.values,
-        this._config.expression, 
-        function(expr) {
+  var self = this;
+  var title = (this._config.columnName) ? 
+      ("Edit Facet's Expression based on Column " + this._config.columnName) : 
+        "Edit Facet's Expression";
+
+      var column = Refine.columnNameToColumn(this._config.columnName);
+      var o = DataTableView.sampleVisibleRows(column);
+
+      new ExpressionPreviewDialog(
+          title,
+          column ? column.cellIndex : -1, 
+              o.rowIndices,
+              o.values,
+              this._config.expression, 
+              function(expr) {
             if (expr != self._config.expression) {
-                self._config.expression = expr;
-                self._elmts.expressionDiv.text(self._config.expression);
-                
-                self.reset();
-                self._from = null;
-                self._to = null;
-                self._updateRest();
+              self._config.expression = expr;
+              self._elmts.expressionDiv.text(self._config.expression);
+
+              self.reset();
+              self._from = null;
+              self._to = null;
+              self._updateRest();
             }
-        }
-    );
+          }
+      );
 };
\ No newline at end of file
diff --git a/main/webapp/modules/core/scripts/facets/scatterplot-facet.js b/main/webapp/modules/core/scripts/facets/scatterplot-facet.js
index ff01683c6..0c58a7dfa 100644
--- a/main/webapp/modules/core/scripts/facets/scatterplot-facet.js
+++ b/main/webapp/modules/core/scripts/facets/scatterplot-facet.js
@@ -7,13 +7,13 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-    * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -29,328 +29,328 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-*/
+ */
 
 function ScatterplotFacet(div, config, options) {
-    this._div = div;
-    this._config = config;
-    this._options = options;
-    
-    this._error = false;
-    this._initializedUI = false;
+  this._div = div;
+  this._config = config;
+  this._options = options;
+
+  this._error = false;
+  this._initializedUI = false;
 }
 
 ScatterplotFacet.prototype.update = function() {
-    this._plotAreaSelector.update();
+  this._plotAreaSelector.update();
 };
 
 ScatterplotFacet.prototype.reset = function() {
-    delete this._config.from_x;
-    delete this._config.from_y;
-    delete this._config.to_x;
-    delete this._config.to_y;
-    this._plotAreaSelector.setOptions({ hide : true });
-    this._plotAreaSelector.update();
+  delete this._config.from_x;
+  delete this._config.from_y;
+  delete this._config.to_x;
+  delete this._config.to_y;
+  this._plotAreaSelector.setOptions({ hide : true });
+  this._plotAreaSelector.update();
 };
 
 ScatterplotFacet.reconstruct = function(div, uiState) {
-    return new ScatterplotFacet(div, uiState.c, uiState.o);
+  return new ScatterplotFacet(div, uiState.c, uiState.o);
 };
 
 ScatterplotFacet.prototype.dispose = function() {
-    this._elmts.plotImg.imgAreaSelect({ hide : true });
+  this._elmts.plotImg.imgAreaSelect({ hide : true });
 };
 
 ScatterplotFacet.prototype.getUIState = function() {
-    var json = {
-        c: this.getJSON(),
-        o: this._options
-    };
-    
-    return json;
+  var json = {
+      c: this.getJSON(),
+      o: this._options
+  };
+
+  return json;
 };
 
 ScatterplotFacet.prototype.getJSON = function() {
-    this._config.type = "scatterplot";
-    var dot = this._config.dot;
-    if (typeof dot == 'number') this._config.dot.toFixed(2);
-    return this._config;
+  this._config.type = "scatterplot";
+  var dot = this._config.dot;
+  if (typeof dot == 'number') this._config.dot.toFixed(2);
+  return this._config;
 };
 
 ScatterplotFacet.prototype.hasSelection = function() {
-    return  ("from_x" in this._config && this._config.from_x !== 0) ||
-        ("from_y" in this._config && this._config.from_y !== 0) ||
-        ("to_x" in this._config && this._config.to_x !== 1) ||
-        ("to_y" in this._config && this._config.to_y !== 1);
+  return  ("from_x" in this._config && this._config.from_x !== 0) ||
+  ("from_y" in this._config && this._config.from_y !== 0) ||
+  ("to_x" in this._config && this._config.to_x !== 1) ||
+  ("to_y" in this._config && this._config.to_y !== 1);
 };
 
 ScatterplotFacet.prototype._initializeUI = function() {
-    var self = this;
-    var container = this._div.empty().show();
-    
-    var facet_id = container.attr("id");
-    
-    this._div.empty().show().html(
-        '<div class="facet-title">' +
-            '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
-                '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
-                '<td>' +
-                    '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
-                    '<span bind="titleSpan"></span>' +
-                '</td>' +
-            '</tr></table></div>' +
-        '</div>' +
-        '<div class="facet-scatterplot-body" bind="bodyDiv">' +
-            '<div class="facet-scatterplot-message" bind="messageDiv">Loading...</div>' +
-            '<table width="100%"><tr>' + 
-                '<td>' +
-                    '<div class="facet-scatterplot-plot-container">' +
-                        '<div class="facet-scatterplot-plot" bind="plotDiv">' +
-                            '<img class="facet-scatterplot-image" bind="plotBaseImg" />' +
-                            '<img class="facet-scatterplot-image" bind="plotImg" />' +
-                        '</div>' +
-                    '</div>' +
-                '</td>' +
-                '<td class="facet-scatterplot-selectors-container" width="100%">' +
-                    '<div class="scatterplot-selectors" bind="selectors">' +
-                        '<div class="buttonset scatterplot-dim-selector">' +
-                            '<input type="radio" id="' + facet_id + '-dim-lin" name="' + facet_id + '-dim" value="lin"/><label class="dim-lin-label" for="' + facet_id + '-dim-lin" title="Linear Plot">lin</label>' +
-                            '<input type="radio" id="' + facet_id + '-dim-log" name="' + facet_id + '-dim" value="log"/><label class="dim-log-label" for="' + facet_id + '-dim-log" title="Logarithmic Plot">log</label>' +
-                        '</div>' + 
-                        '<div class="buttonset scatterplot-rot-selector">' +
-                            '<input type="radio" id="' + facet_id + '-rot-ccw"  name="' + facet_id + '-rot" value="ccw"/><label class="rot-ccw-label" for="' + facet_id + '-rot-ccw" title="Rotated 45° Counter-Clockwise">&nbsp;</label>' +
-                            '<input type="radio" id="' + facet_id + '-rot-none" name="' + facet_id + '-rot" value="none"/><label class="rot-none-label" for="' + facet_id + '-rot-none" title="No rotation">&nbsp;</label>' +
-                            '<input type="radio" id="' + facet_id + '-rot-cw"   name="' + facet_id + '-rot" value="cw"/><label class="rot-cw-label" for="' + facet_id + '-rot-cw" title="Rotated 45° Clockwise">&nbsp;</label>' +
-                        '</div>' +
-                        '<div class="buttonset scatterplot-dot-selector">' +
-                            '<input type="radio" id="' + facet_id + '-dot-small"   name="' + facet_id + '-dot" value="small"/><label class="dot-small-label" for="' + facet_id + '-dot-small" title="Small Dot Size">&nbsp;</label>' +
-                            '<input type="radio" id="' + facet_id + '-dot-regular" name="' + facet_id + '-dot" value="regular"/><label class="dot-regular-label" for="' + facet_id + '-dot-regular" title="Regular Dot Size">&nbsp;</label>' +
-                            '<input type="radio" id="' + facet_id + '-dot-big"     name="' + facet_id + '-dot" value="big"/><label class="dot-big-label" for="' + facet_id + '-dot-big" title="Big Dot Size">&nbsp;</label>' +
-                        '</div>' +
-                        '<div class="scatterplot-export-plot"><a bind="exportPlotLink" class="action" target="_blank">export plot</a></div>' +
-                    '</div>' +
-                '</td>' + 
-            '</tr></table>' +
-            '<div class="facet-scatterplot-status" bind="statusDiv"></div>' +
-        '</div>'
-    );
-    this._elmts = DOM.bind(this._div);
-    
-    this._elmts.titleSpan.text(this._config.name);
-    this._elmts.removeButton.click(function() { self._remove(); });
-    this._elmts.resetButton.click(function() {
-        self.reset();
+  var self = this;
+  var container = this._div.empty().show();
+
+  var facet_id = container.attr("id");
+
+  this._div.empty().show().html(
+      '<div class="facet-title">' +
+      '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
+      '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
+      '<td>' +
+      '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
+      '<span bind="titleSpan"></span>' +
+      '</td>' +
+      '</tr></table></div>' +
+      '</div>' +
+      '<div class="facet-scatterplot-body" bind="bodyDiv">' +
+      '<div class="facet-scatterplot-message" bind="messageDiv">Loading...</div>' +
+      '<table width="100%"><tr>' + 
+      '<td>' +
+      '<div class="facet-scatterplot-plot-container">' +
+      '<div class="facet-scatterplot-plot" bind="plotDiv">' +
+      '<img class="facet-scatterplot-image" bind="plotBaseImg" />' +
+      '<img class="facet-scatterplot-image" bind="plotImg" />' +
+      '</div>' +
+      '</div>' +
+      '</td>' +
+      '<td class="facet-scatterplot-selectors-container" width="100%">' +
+      '<div class="scatterplot-selectors" bind="selectors">' +
+      '<div class="buttonset scatterplot-dim-selector">' +
+      '<input type="radio" id="' + facet_id + '-dim-lin" name="' + facet_id + '-dim" value="lin"/><label class="dim-lin-label" for="' + facet_id + '-dim-lin" title="Linear Plot">lin</label>' +
+      '<input type="radio" id="' + facet_id + '-dim-log" name="' + facet_id + '-dim" value="log"/><label class="dim-log-label" for="' + facet_id + '-dim-log" title="Logarithmic Plot">log</label>' +
+      '</div>' + 
+      '<div class="buttonset scatterplot-rot-selector">' +
+      '<input type="radio" id="' + facet_id + '-rot-ccw"  name="' + facet_id + '-rot" value="ccw"/><label class="rot-ccw-label" for="' + facet_id + '-rot-ccw" title="Rotated 45° Counter-Clockwise">&nbsp;</label>' +
+      '<input type="radio" id="' + facet_id + '-rot-none" name="' + facet_id + '-rot" value="none"/><label class="rot-none-label" for="' + facet_id + '-rot-none" title="No rotation">&nbsp;</label>' +
+      '<input type="radio" id="' + facet_id + '-rot-cw"   name="' + facet_id + '-rot" value="cw"/><label class="rot-cw-label" for="' + facet_id + '-rot-cw" title="Rotated 45° Clockwise">&nbsp;</label>' +
+      '</div>' +
+      '<div class="buttonset scatterplot-dot-selector">' +
+      '<input type="radio" id="' + facet_id + '-dot-small"   name="' + facet_id + '-dot" value="small"/><label class="dot-small-label" for="' + facet_id + '-dot-small" title="Small Dot Size">&nbsp;</label>' +
+      '<input type="radio" id="' + facet_id + '-dot-regular" name="' + facet_id + '-dot" value="regular"/><label class="dot-regular-label" for="' + facet_id + '-dot-regular" title="Regular Dot Size">&nbsp;</label>' +
+      '<input type="radio" id="' + facet_id + '-dot-big"     name="' + facet_id + '-dot" value="big"/><label class="dot-big-label" for="' + facet_id + '-dot-big" title="Big Dot Size">&nbsp;</label>' +
+      '</div>' +
+      '<div class="scatterplot-export-plot"><a bind="exportPlotLink" class="action" target="_blank">export plot</a></div>' +
+      '</div>' +
+      '</td>' + 
+      '</tr></table>' +
+      '<div class="facet-scatterplot-status" bind="statusDiv"></div>' +
+      '</div>'
+  );
+  this._elmts = DOM.bind(this._div);
+
+  this._elmts.titleSpan.text(this._config.name);
+  this._elmts.removeButton.click(function() { self._remove(); });
+  this._elmts.resetButton.click(function() {
+    self.reset();
+    self._updateRest();
+  });
+
+  this._elmts.plotDiv.width(this._config.l + "px").height(this._config.l + "px");
+  this._elmts.plotBaseImg.attr("src", this._formulateBaseImageUrl())
+  .attr("width", this._config.l)
+  .attr("height", this._config.l);
+  this._elmts.plotImg.attr("src", this._formulateCurrentImageUrl())
+  .attr("width", this._config.l)
+  .attr("height", this._config.l);
+
+  var ops = {
+      instance: true,        
+      handles: false,
+      parent: this._elmts.plotDiv,
+      fadeSpeed: 70,
+      onSelectEnd: function(elmt, selection) {
+        self._putSelectionOptions(selection);
         self._updateRest();
-    });
-    
-    this._elmts.plotDiv.width(this._config.l + "px").height(this._config.l + "px");
-    this._elmts.plotBaseImg.attr("src", this._formulateBaseImageUrl())
-        .attr("width", this._config.l)
-        .attr("height", this._config.l);
-    this._elmts.plotImg.attr("src", this._formulateCurrentImageUrl())
-        .attr("width", this._config.l)
-        .attr("height", this._config.l);
-    
-    var ops = {
-        instance: true,        
-        handles: false,
-        parent: this._elmts.plotDiv,
-        fadeSpeed: 70,
-        onSelectEnd: function(elmt, selection) {
-            self._putSelectionOptions(selection);
-            self._updateRest();
-        }
-    };
+      }
+  };
 
-    this._fillSelectionOptions(ops);
-    this._plotAreaSelector = this._elmts.plotImg.imgAreaSelect(ops);
-    
-    if (this._config.dim_x == 'lin' && this._config.dim_y == 'lin') {
-        this._elmts.selectors.find("#" + facet_id + "-dim-lin").attr('checked','checked');
-    } else if (this._config.dim_x == 'log' && this._config.dim_y == 'log') {
-        this._elmts.selectors.find("#" + facet_id + "-dim-log").attr('checked','checked');
-    }
+  this._fillSelectionOptions(ops);
+  this._plotAreaSelector = this._elmts.plotImg.imgAreaSelect(ops);
 
-    if (this._config.r == 'cw') {
-        this._elmts.selectors.find("#" + facet_id + "-rot-cw").attr('checked','checked');
-    } else if (this._config.r == 'ccw') {
-        this._elmts.selectors.find("#" + facet_id + "-rot-ccw").attr('checked','checked');
+  if (this._config.dim_x == 'lin' && this._config.dim_y == 'lin') {
+    this._elmts.selectors.find("#" + facet_id + "-dim-lin").attr('checked','checked');
+  } else if (this._config.dim_x == 'log' && this._config.dim_y == 'log') {
+    this._elmts.selectors.find("#" + facet_id + "-dim-log").attr('checked','checked');
+  }
+
+  if (this._config.r == 'cw') {
+    this._elmts.selectors.find("#" + facet_id + "-rot-cw").attr('checked','checked');
+  } else if (this._config.r == 'ccw') {
+    this._elmts.selectors.find("#" + facet_id + "-rot-ccw").attr('checked','checked');
+  } else {
+    this._elmts.selectors.find("#" + facet_id + "-rot-none").attr('checked','checked');
+  }
+
+  if (this._config.dot >= 1.2) {
+    this._elmts.selectors.find("#" + facet_id + "-dot-big").attr('checked','checked');
+  } else if (this._config.dot <= 0.4) {
+    this._elmts.selectors.find("#" + facet_id + "-dot-small").attr('checked','checked');
+  } else {
+    this._elmts.selectors.find("#" + facet_id + "-dot-regular").attr('checked','checked');
+  }
+
+  this._elmts.selectors.find(".scatterplot-dim-selector").change(function() {
+    var dim = $(this).find("input:checked").val();
+    self._config.dim_x = dim;
+    self._config.dim_y = dim;
+    self.reset();
+    self._updateRest();
+    self.changePlot();
+  });
+
+  this._elmts.selectors.find(".scatterplot-rot-selector").change(function() {
+    self._config.r = $(this).find("input:checked").val();
+    self.reset();
+    self._updateRest();
+    self.changePlot();        
+  });
+
+  this._elmts.selectors.find(".scatterplot-dot-selector").change(function() {
+    var dot_size = $(this).find("input:checked").val();
+    if (dot_size == "small") {
+      self._config.dot = 0.4;
+    } else if (dot_size == "big") {
+      self._config.dot = 1.4;
     } else {
-        this._elmts.selectors.find("#" + facet_id + "-rot-none").attr('checked','checked');
+      self._config.dot = 0.8;
     }
+    self.changePlot();
+  });
 
-    if (this._config.dot >= 1.2) {
-        this._elmts.selectors.find("#" + facet_id + "-dot-big").attr('checked','checked');
-    } else if (this._config.dot <= 0.4) {
-        this._elmts.selectors.find("#" + facet_id + "-dot-small").attr('checked','checked');
-    } else {
-        this._elmts.selectors.find("#" + facet_id + "-dot-regular").attr('checked','checked');
-    }
-    
-    this._elmts.selectors.find(".scatterplot-dim-selector").change(function() {
-        var dim = $(this).find("input:checked").val();
-        self._config.dim_x = dim;
-        self._config.dim_y = dim;
-        self.reset();
-        self._updateRest();
-        self.changePlot();
-    });
-
-    this._elmts.selectors.find(".scatterplot-rot-selector").change(function() {
-        self._config.r = $(this).find("input:checked").val();
-        self.reset();
-        self._updateRest();
-        self.changePlot();        
-    });
-
-    this._elmts.selectors.find(".scatterplot-dot-selector").change(function() {
-        var dot_size = $(this).find("input:checked").val();
-        if (dot_size == "small") {
-            self._config.dot = 0.4;
-        } else if (dot_size == "big") {
-            self._config.dot = 1.4;
-        } else {
-            self._config.dot = 0.8;
-        }
-        self.changePlot();
-    });
-    
-    this._elmts.selectors.find(".buttonset").buttonset();
+  this._elmts.selectors.find(".buttonset").buttonset();
 };
 
 ScatterplotFacet.prototype._fillSelectionOptions = function(ops) {
-    if (this.hasSelection()) {
-        ops.x1 = this._config.l * this._config.from_x;
-        ops.x2 = this._config.l * this._config.to_x;
-        
-        ops.y1 = this._config.l - (this._config.l * this._config.to_y);
-        ops.y2 = this._config.l - (this._config.l * this._config.from_y);
-    } else {
-        ops.x1 = ops.y1 = 0;
-        ops.x2 = ops.y2 = this._config.l;
-        ops.hide = true;
-    }
+  if (this.hasSelection()) {
+    ops.x1 = this._config.l * this._config.from_x;
+    ops.x2 = this._config.l * this._config.to_x;
+
+    ops.y1 = this._config.l - (this._config.l * this._config.to_y);
+    ops.y2 = this._config.l - (this._config.l * this._config.from_y);
+  } else {
+    ops.x1 = ops.y1 = 0;
+    ops.x2 = ops.y2 = this._config.l;
+    ops.hide = true;
+  }
 };
 
 ScatterplotFacet.prototype._putSelectionOptions = function(selection) {
-    if (selection.height === 0 || selection.width === 0) {
-        this.reset();
-    } else {
-        this._config.from_x = selection.x1 / this._config.l;
-        this._config.to_x = selection.x2 / this._config.l;
-        
-        this._config.from_y = (this._config.l - selection.y2) / this._config.l;
-        this._config.to_y = (this._config.l - selection.y1) / this._config.l;
-    }
+  if (selection.height === 0 || selection.width === 0) {
+    this.reset();
+  } else {
+    this._config.from_x = selection.x1 / this._config.l;
+    this._config.to_x = selection.x2 / this._config.l;
+
+    this._config.from_y = (this._config.l - selection.y2) / this._config.l;
+    this._config.to_y = (this._config.l - selection.y1) / this._config.l;
+  }
 };
 
 ScatterplotFacet.prototype._formulateCurrentImageUrl = function() {
-    return this._formulateImageUrl(ui.browsingEngine.getJSON(false, this), { color: "ff6a00" });
+  return this._formulateImageUrl(ui.browsingEngine.getJSON(false, this), { color: "ff6a00" });
 };
 
 ScatterplotFacet.prototype._formulateBaseImageUrl = function() {
-    return this._formulateImageUrl({},{ color: "888888", dot : this._config.dot * 0.9 });
+  return this._formulateImageUrl({},{ color: "888888", dot : this._config.dot * 0.9 });
 };
 
 ScatterplotFacet.prototype._formulateExportImageUrl = function() {
-    return this._formulateImageUrl(ui.browsingEngine.getJSON(false, this), { dot : this._config.dot * 5, l: 500, base_color: "888888" });
+  return this._formulateImageUrl(ui.browsingEngine.getJSON(false, this), { dot : this._config.dot * 5, l: 500, base_color: "888888" });
 };
 
 ScatterplotFacet.prototype._formulateImageUrl = function(engineConfig, conf) {
-    var options = {};
-    for (var p in this._config) {
-        if (this._config.hasOwnProperty(p)) {        
-            options[p] = this._config[p];
-        }
+  var options = {};
+  for (var p in this._config) {
+    if (this._config.hasOwnProperty(p)) {        
+      options[p] = this._config[p];
     }
-    for (var p in conf) {
-        if (conf.hasOwnProperty(p)) {        
-            options[p] = conf[p];
-        }
+  }
+  for (var p in conf) {
+    if (conf.hasOwnProperty(p)) {        
+      options[p] = conf[p];
     }
-    var params = {
-        project: theProject.id,
-        engine: JSON.stringify(engineConfig), 
-        plotter: JSON.stringify(options) 
-    };
-    return "/command/core/get-scatterplot?" + $.param(params);
+  }
+  var params = {
+      project: theProject.id,
+      engine: JSON.stringify(engineConfig), 
+      plotter: JSON.stringify(options) 
+  };
+  return "/command/core/get-scatterplot?" + $.param(params);
 };
 
 ScatterplotFacet.prototype.updateState = function(data) {
-    if ("error" in data) {
-        this._error = true;
-        this._errorMessage = "error" in data ? data.error : "Unknown error.";
-    } else {
-        this._error = false;
-        
-        // These are in 0 - 1 coordinates
-        if ("from_x" in data) {
-            this._config.from_x = Math.min(Math.max(data.from_x, 0), 1);
-        } else {
-            this._config.from_x = 0;
-        }
-        if ("to_x" in data) {
-            this._config.to_x = Math.min(Math.max(data.to_x, data.from_x), 1);
-        } else {
-            this._config.to_x = 1;
-        }
+  if ("error" in data) {
+    this._error = true;
+    this._errorMessage = "error" in data ? data.error : "Unknown error.";
+  } else {
+    this._error = false;
 
-        if ("from_y" in data) {
-            this._config.from_y = Math.min(Math.max(data.from_y, 0), 1);
-        } else {
-            this._config.from_y = 0;
-        }
-        if ("to_y" in data) {
-            this._config.to_y = Math.min(Math.max(data.to_y, data.from_y), this._config.l);
-        } else {
-            this._config.to_y = 1;
-        }
-        
-        if (this._plotAreaSelector) {
-            var ops = {};
-            this._fillSelectionOptions(ops);
-            this._plotAreaSelector.setOptions(ops);
-            this._plotAreaSelector.update();
-        }
+    // These are in 0 - 1 coordinates
+    if ("from_x" in data) {
+      this._config.from_x = Math.min(Math.max(data.from_x, 0), 1);
+    } else {
+      this._config.from_x = 0;
     }
-    
-    this.render();
+    if ("to_x" in data) {
+      this._config.to_x = Math.min(Math.max(data.to_x, data.from_x), 1);
+    } else {
+      this._config.to_x = 1;
+    }
+
+    if ("from_y" in data) {
+      this._config.from_y = Math.min(Math.max(data.from_y, 0), 1);
+    } else {
+      this._config.from_y = 0;
+    }
+    if ("to_y" in data) {
+      this._config.to_y = Math.min(Math.max(data.to_y, data.from_y), this._config.l);
+    } else {
+      this._config.to_y = 1;
+    }
+
+    if (this._plotAreaSelector) {
+      var ops = {};
+      this._fillSelectionOptions(ops);
+      this._plotAreaSelector.setOptions(ops);
+      this._plotAreaSelector.update();
+    }
+  }
+
+  this.render();
 };
 
 ScatterplotFacet.prototype.changePlot = function() {
-    this._elmts.plotBaseImg.attr("src", this._formulateBaseImageUrl());
-    this._elmts.plotImg.attr("src", this._formulateCurrentImageUrl());
-    this._elmts.exportPlotLink.attr("href", this._formulateExportImageUrl());
+  this._elmts.plotBaseImg.attr("src", this._formulateBaseImageUrl());
+  this._elmts.plotImg.attr("src", this._formulateCurrentImageUrl());
+  this._elmts.exportPlotLink.attr("href", this._formulateExportImageUrl());
 };
 
 ScatterplotFacet.prototype.render = function() {
-    if (!this._initializedUI) {
-        this._initializeUI();
-        this._initializedUI = true;
-    }
-    
-    if (this._error) {
-        this._elmts.messageDiv.text(this._errorMessage).show();
-        this._elmts.plotDiv.hide();
-        this._elmts.statusDiv.hide();
-        return;
-    }
-    
-    this._elmts.messageDiv.hide();
-    this._elmts.plotDiv.show();
-    this._elmts.statusDiv.show();
-    
-    this._elmts.plotImg.attr("src", this._formulateCurrentImageUrl());
-    this._elmts.exportPlotLink.attr("href", this._formulateExportImageUrl());
+  if (!this._initializedUI) {
+    this._initializeUI();
+    this._initializedUI = true;
+  }
+
+  if (this._error) {
+    this._elmts.messageDiv.text(this._errorMessage).show();
+    this._elmts.plotDiv.hide();
+    this._elmts.statusDiv.hide();
+    return;
+  }
+
+  this._elmts.messageDiv.hide();
+  this._elmts.plotDiv.show();
+  this._elmts.statusDiv.show();
+
+  this._elmts.plotImg.attr("src", this._formulateCurrentImageUrl());
+  this._elmts.exportPlotLink.attr("href", this._formulateExportImageUrl());
 };
 
 ScatterplotFacet.prototype._remove = function() {
-    ui.browsingEngine.removeFacet(this);
-    
-    this._div = null;
-    this._config = null;
+  ui.browsingEngine.removeFacet(this);
+
+  this._div = null;
+  this._config = null;
 };
 
 ScatterplotFacet.prototype._updateRest = function() {
-    Refine.update({ engineChanged: true });
+  Refine.update({ engineChanged: true });
 };
diff --git a/main/webapp/modules/core/scripts/facets/text-search-facet.js b/main/webapp/modules/core/scripts/facets/text-search-facet.js
index dd273e932..67cdcc6ed 100644
--- a/main/webapp/modules/core/scripts/facets/text-search-facet.js
+++ b/main/webapp/modules/core/scripts/facets/text-search-facet.js
@@ -7,13 +7,13 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-    * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -29,139 +29,139 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-*/
+ */
 
 function TextSearchFacet(div, config, options) {
-    this._div = div;
-    this._config = config;
-    this._options = options;
-    
-    this._query = config.query || null;
-    this._timerID = null;
-    
-    this._initializeUI();
+  this._div = div;
+  this._config = config;
+  this._options = options;
+
+  this._query = config.query || null;
+  this._timerID = null;
+
+  this._initializeUI();
 }
 
 TextSearchFacet.reconstruct = function(div, uiState) {
-    return new TextSearchFacet(div, uiState.c, uiState.o);
+  return new TextSearchFacet(div, uiState.c, uiState.o);
 };
 
 TextSearchFacet.prototype.dispose = function() {
 };
 
 TextSearchFacet.prototype.reset = function() {
-    this._query = null;
-    this._div.find(".input-container input").each(function() { this.value = ""; });
+  this._query = null;
+  this._div.find(".input-container input").each(function() { this.value = ""; });
 };
 
 TextSearchFacet.prototype.getUIState = function() {
-    var json = {
-        c: this.getJSON(),
-        o: this._options
-    };
-    
-    return json;
+  var json = {
+      c: this.getJSON(),
+      o: this._options
+  };
+
+  return json;
 };
 
 TextSearchFacet.prototype.getJSON = function() {
-    var o = {
-        type: "text",
-        name: this._config.name,
-        columnName: this._config.columnName,
-        mode: this._config.mode,
-        caseSensitive: this._config.caseSensitive,
-        query: this._query
-    };
-    return o;
+  var o = {
+      type: "text",
+      name: this._config.name,
+      columnName: this._config.columnName,
+      mode: this._config.mode,
+      caseSensitive: this._config.caseSensitive,
+      query: this._query
+  };
+  return o;
 };
 
 TextSearchFacet.prototype.hasSelection = function() {
-    return this._query !== null;
+  return this._query !== null;
 };
 
 TextSearchFacet.prototype._initializeUI = function() {
-    var self = this;
-    this._div.empty().show().html(
-        '<div class="facet-title">' + 
-            '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
-                '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
-                '<td>' +
-                    '<span>' + this._config.name + '</span>' +
-                '</td>' +
-            '</tr></table></div>' +
-        '</div>' +
-        '<div class="facet-text-body"><div class="grid-layout layout-tightest layout-full"><table>' +
-            '<tr><td colspan="4"><div class="input-container"><input bind="input" /></div></td></tr>' +
-            '<tr>' +
-                '<td width="1%"><input type="checkbox" bind="caseSensitiveCheckbox" /></td><td>case sensitive</td>' +
-                '<td width="1%"><input type="checkbox" bind="regexCheckbox" /></td><td>regular expression</td>' +
-            '</tr>' +
-        '</table></div></div>'
-    );
-    
-    var elmts = DOM.bind(this._div);
-    
-    if (this._config.caseSensitive) {
-        elmts.caseSensitiveCheckbox.attr("checked", "true");
+  var self = this;
+  this._div.empty().show().html(
+      '<div class="facet-title">' + 
+      '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
+      '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
+      '<td>' +
+      '<span>' + this._config.name + '</span>' +
+      '</td>' +
+      '</tr></table></div>' +
+      '</div>' +
+      '<div class="facet-text-body"><div class="grid-layout layout-tightest layout-full"><table>' +
+      '<tr><td colspan="4"><div class="input-container"><input bind="input" /></div></td></tr>' +
+      '<tr>' +
+      '<td width="1%"><input type="checkbox" bind="caseSensitiveCheckbox" /></td><td>case sensitive</td>' +
+      '<td width="1%"><input type="checkbox" bind="regexCheckbox" /></td><td>regular expression</td>' +
+      '</tr>' +
+      '</table></div></div>'
+  );
+
+  var elmts = DOM.bind(this._div);
+
+  if (this._config.caseSensitive) {
+    elmts.caseSensitiveCheckbox.attr("checked", "true");
+  }
+  if (this._config.mode == "regex") {
+    elmts.regexCheckbox.attr("checked", "true");
+  }
+
+  elmts.removeButton.click(function() { self._remove(); });
+
+  elmts.caseSensitiveCheckbox.bind("change", function() {
+    self._config.caseSensitive = this.checked;
+    if (self._query !== null && self._query.length > 0) {
+      self._scheduleUpdate();
     }
-    if (this._config.mode == "regex") {
-        elmts.regexCheckbox.attr("checked", "true");
+  });
+  elmts.regexCheckbox.bind("change", function() {
+    self._config.mode = this.checked ? "regex" : "text";
+    if (self._query !== null && self._query.length > 0) {
+      self._scheduleUpdate();
     }
-    
-    elmts.removeButton.click(function() { self._remove(); });
-    
-    elmts.caseSensitiveCheckbox.bind("change", function() {
-        self._config.caseSensitive = this.checked;
-        if (self._query !== null && self._query.length > 0) {
-            self._scheduleUpdate();
-        }
-    });
-    elmts.regexCheckbox.bind("change", function() {
-        self._config.mode = this.checked ? "regex" : "text";
-        if (self._query !== null && self._query.length > 0) {
-            self._scheduleUpdate();
-        }
-    });
-    
-    if (this._query) {
-        elmts.input[0].value = this._query;
-    }
-    elmts.input.keyup(function(evt) {
-        self._query = this.value;
-        self._scheduleUpdate();
-    }).focus();
+  });
+
+  if (this._query) {
+    elmts.input[0].value = this._query;
+  }
+  elmts.input.keyup(function(evt) {
+    self._query = this.value;
+    self._scheduleUpdate();
+  }).focus();
 };
 
 TextSearchFacet.prototype.updateState = function(data) {
 };
 
 TextSearchFacet.prototype.render = function() {
-    this._setRangeIndicators();
+  this._setRangeIndicators();
 };
 
 TextSearchFacet.prototype._reset = function() {
-    this._query = null;
-    this._updateRest();
+  this._query = null;
+  this._updateRest();
 };
 
 TextSearchFacet.prototype._remove = function() {
-    ui.browsingEngine.removeFacet(this);
-    
-    this._div = null;
-    this._config = null;
-    this._options = null;
+  ui.browsingEngine.removeFacet(this);
+
+  this._div = null;
+  this._config = null;
+  this._options = null;
 };
 
 TextSearchFacet.prototype._scheduleUpdate = function() {
-    if (!this._timerID) {
-        var self = this;
-        this._timerID = window.setTimeout(function() {
-            self._timerID = null;
-            self._updateRest();
-        }, 500);
-    }
+  if (!this._timerID) {
+    var self = this;
+    this._timerID = window.setTimeout(function() {
+      self._timerID = null;
+      self._updateRest();
+    }, 500);
+  }
 };
 
 TextSearchFacet.prototype._updateRest = function() {
-    Refine.update({ engineChanged: true });
+  Refine.update({ engineChanged: true });
 };
diff --git a/main/webapp/modules/core/scripts/facets/timerange-facet.js b/main/webapp/modules/core/scripts/facets/timerange-facet.js
index 223ceaf56..e59706ca1 100644
--- a/main/webapp/modules/core/scripts/facets/timerange-facet.js
+++ b/main/webapp/modules/core/scripts/facets/timerange-facet.js
@@ -7,13 +7,13 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
+ * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-    * Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
@@ -29,401 +29,401 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-*/
+ */
 
 function TimeRangeFacet(div, config, options) {
-    this._div = div;
-    this._config = config;
-    this._options = options;
-    
-    this._from = ("from" in this._config) ? this._config.from : null;
-    this._to = ("to" in this._config) ? this._config.to : null;
-    this._step = ("step" in this._config) ? this._config.step : null;
-    
-    this._selectTime = ("selectTime" in this._config) ? this._config.selectTime : true;
-    this._selectNonTime = ("selectNonTime" in this._config) ? this._config.selectNonTime : true;
-    this._selectBlank = ("selectBlank" in this._config) ? this._config.selectBlank : true;
-    this._selectError = ("selectError" in this._config) ? this._config.selectError : true;
-    
-    this._baseTimeCount = 0;
-    this._baseNonTimeCount = 0;
-    this._baseBlankCount = 0;
-    this._baseErrorCount = 0;
-    
-    this._timeCount = 0;
-    this._nonTimeCount = 0;
-    this._blankCount = 0;
-    this._errorCount = 0;
-    
-    this._error = false;
-    this._initializedUI = false;
+  this._div = div;
+  this._config = config;
+  this._options = options;
+
+  this._from = ("from" in this._config) ? this._config.from : null;
+  this._to = ("to" in this._config) ? this._config.to : null;
+  this._step = ("step" in this._config) ? this._config.step : null;
+
+  this._selectTime = ("selectTime" in this._config) ? this._config.selectTime : true;
+  this._selectNonTime = ("selectNonTime" in this._config) ? this._config.selectNonTime : true;
+  this._selectBlank = ("selectBlank" in this._config) ? this._config.selectBlank : true;
+  this._selectError = ("selectError" in this._config) ? this._config.selectError : true;
+
+  this._baseTimeCount = 0;
+  this._baseNonTimeCount = 0;
+  this._baseBlankCount = 0;
+  this._baseErrorCount = 0;
+
+  this._timeCount = 0;
+  this._nonTimeCount = 0;
+  this._blankCount = 0;
+  this._errorCount = 0;
+
+  this._error = false;
+  this._initializedUI = false;
 }
 
 TimeRangeFacet.prototype.reset = function() {
-    this._from = this._config.min;
-    this._to = this._config.max;
-    this._sliderWidget.update(
-        this._config.min, 
-        this._config.max, 
-        this._config.step, 
-        this._from,
-        this._to
-    );
-        
-    this._selectTime = true;
-    this._selectNonTime = true;
-    this._selectBlank = true;
-    this._selectError = true;
-    
-    this._setRangeIndicators();
+  this._from = this._config.min;
+  this._to = this._config.max;
+  this._sliderWidget.update(
+      this._config.min, 
+      this._config.max, 
+      this._config.step, 
+      this._from,
+      this._to
+  );
+
+  this._selectTime = true;
+  this._selectNonTime = true;
+  this._selectBlank = true;
+  this._selectError = true;
+
+  this._setRangeIndicators();
 };
 
 TimeRangeFacet.reconstruct = function(div, uiState) {
-    return new TimeRangeFacet(div, uiState.c, uiState.o);
+  return new TimeRangeFacet(div, uiState.c, uiState.o);
 };
 
 TimeRangeFacet.prototype.dispose = function() {
 };
 
 TimeRangeFacet.prototype.getUIState = function() {
-    var json = {
-        c: this.getJSON(),
-        o: this._options
-    };
-    
-    return json;
+  var json = {
+      c: this.getJSON(),
+      o: this._options
+  };
+
+  return json;
 };
 
 TimeRangeFacet.prototype.getJSON = function() {
-    var o = {
-        type: "timerange",
-        name: this._config.name,
-        expression: this._config.expression,
-        columnName: this._config.columnName,
-        selectTime: this._selectTime,
-        selectNonTime: this._selectNonTime,
-        selectBlank: this._selectBlank,
-        selectError: this._selectError
-    };
-    
-    if (this._from !== null) {
-        o.from = this._from;
-    }
-    if (this._to !== null) {
-        o.to = this._to;
-    }
-    
-    return o;
+  var o = {
+      type: "timerange",
+      name: this._config.name,
+      expression: this._config.expression,
+      columnName: this._config.columnName,
+      selectTime: this._selectTime,
+      selectNonTime: this._selectNonTime,
+      selectBlank: this._selectBlank,
+      selectError: this._selectError
+  };
+
+  if (this._from !== null) {
+    o.from = this._from;
+  }
+  if (this._to !== null) {
+    o.to = this._to;
+  }
+
+  return o;
 };
 
 TimeRangeFacet.prototype.hasSelection = function() {
-    if (!this._selectTime || !this._selectNonTime || !this._selectBlank || !this._selectError) {
-        return true;
-    }
-    
-    return (this._from !== null && (!this._initializedUI || this._from > this._config.min)) ||
-        (this._to !== null && (!this._initializedUI || this._to < this._config.max));
+  if (!this._selectTime || !this._selectNonTime || !this._selectBlank || !this._selectError) {
+    return true;
+  }
+
+  return (this._from !== null && (!this._initializedUI || this._from > this._config.min)) ||
+  (this._to !== null && (!this._initializedUI || this._to < this._config.max));
 };
 
 TimeRangeFacet.prototype._initializeUI = function() {
-    var self = this;
-    this._div
-        .empty()
-        .show()
-        .html(
-            '<div class="facet-title" bind="headerDiv">' +
-                '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
-                    '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
-                    '<td>' +
-                        '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
-                        '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">change</a>' +
-                        '<span bind="facetTitle"></span>' +
-                    '</td>' +
-                '</tr></table></div>' +
-            '</div>' +
-            '<div class="facet-expression" bind="expressionDiv" title="Click to edit expression"></div>' +
-            '<div class="facet-range-body">' +
-                '<div class="facet-range-message" bind="messageDiv">Loading...</div>' +
-                '<div class="facet-range-slider" bind="sliderWidgetDiv">' +
-                    '<div class="facet-range-histogram" bind="histogramDiv"></div>' +
-                '</div>' +
-                '<div class="facet-range-status" bind="statusDiv"></div>' +
-                '<div class="facet-range-other-choices" bind="otherChoicesDiv"></div>' +
-            '</div>'
-        );
-    this._elmts = DOM.bind(this._div);
-    
-    this._elmts.facetTitle.text(this._config.name);
-    this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
-        self._elmts.expressionDiv.slideToggle(100, function() {
-            if (self._elmts.expressionDiv.css("display") != "none") {
-                self._editExpression();
-            }
-        });
-    });
-    this._elmts.expressionDiv.text(this._config.expression).click(function() { 
-        self._editExpression(); 
-    }).hide();
-    
-    this._elmts.resetButton.click(function() {
-        self.reset();
-        self._updateRest();
-    });
-    this._elmts.removeButton.click(function() {
-        self._remove();
-    });
-        
-    this._histogram = new HistogramWidget(this._elmts.histogramDiv, { binColors: [ "#ccccff", "#6666ff" ] });
-    this._sliderWidget = new SliderWidget(this._elmts.sliderWidgetDiv);
-    
-    this._elmts.sliderWidgetDiv.bind("slide", function(evt, data) {
-        self._from = data.from;
-        self._to = data.to;
-        self._setRangeIndicators();
-    }).bind("stop", function(evt, data) {
-        self._from = data.from;
-        self._to = data.to;
-        self._selectTime = true;
-        self._updateRest();
+  var self = this;
+  this._div
+  .empty()
+  .show()
+  .html(
+      '<div class="facet-title" bind="headerDiv">' +
+      '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
+      '<td width="1%"><a href="javascript:{}" title="Remove this facet" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
+      '<td>' +
+      '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">reset</a>' +
+      '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">change</a>' +
+      '<span bind="facetTitle"></span>' +
+      '</td>' +
+      '</tr></table></div>' +
+      '</div>' +
+      '<div class="facet-expression" bind="expressionDiv" title="Click to edit expression"></div>' +
+      '<div class="facet-range-body">' +
+      '<div class="facet-range-message" bind="messageDiv">Loading...</div>' +
+      '<div class="facet-range-slider" bind="sliderWidgetDiv">' +
+      '<div class="facet-range-histogram" bind="histogramDiv"></div>' +
+      '</div>' +
+      '<div class="facet-range-status" bind="statusDiv"></div>' +
+      '<div class="facet-range-other-choices" bind="otherChoicesDiv"></div>' +
+      '</div>'
+  );
+  this._elmts = DOM.bind(this._div);
+
+  this._elmts.facetTitle.text(this._config.name);
+  this._elmts.changeButton.attr("title","Current Expression: " + this._config.expression).click(function() {
+    self._elmts.expressionDiv.slideToggle(100, function() {
+      if (self._elmts.expressionDiv.css("display") != "none") {
+        self._editExpression();
+      }
     });
+  });
+  this._elmts.expressionDiv.text(this._config.expression).click(function() { 
+    self._editExpression(); 
+  }).hide();
+
+  this._elmts.resetButton.click(function() {
+    self.reset();
+    self._updateRest();
+  });
+  this._elmts.removeButton.click(function() {
+    self._remove();
+  });
+
+  this._histogram = new HistogramWidget(this._elmts.histogramDiv, { binColors: [ "#ccccff", "#6666ff" ] });
+  this._sliderWidget = new SliderWidget(this._elmts.sliderWidgetDiv);
+
+  this._elmts.sliderWidgetDiv.bind("slide", function(evt, data) {
+    self._from = data.from;
+    self._to = data.to;
+    self._setRangeIndicators();
+  }).bind("stop", function(evt, data) {
+    self._from = data.from;
+    self._to = data.to;
+    self._selectTime = true;
+    self._updateRest();
+  });
 };
 
 TimeRangeFacet.prototype._renderOtherChoices = function() {
-    var self = this;
-    var container = this._elmts.otherChoicesDiv.empty();
-    
-    if (this._baseNonTimeCount === 0 && this._baseBlankCount === 0 && this._baseErrorCount === 0) {
-        return;
-    }
+  var self = this;
+  var container = this._elmts.otherChoicesDiv.empty();
 
-    var facet_id = this._div.attr("id");
-    
-    var choices = $('<div>').addClass("facet-range-choices");
+  if (this._baseNonTimeCount === 0 && this._baseBlankCount === 0 && this._baseErrorCount === 0) {
+    return;
+  }
 
-    // ----------------- time -----------------
-    
-    var timeDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
-    var timeCheck = $('<input type="checkbox" />').attr("id",facet_id + "-time").appendTo(timeDiv).change(function() {
-        self._selectTime = !self._selectTime;
-        self._updateRest();
-    });
-    if (this._selectTime) timeCheck.attr("checked","checked");
-    
-    var timeLabel = $('<label>').attr("for", facet_id + "-time").appendTo(timeDiv);    
-    $('<span>').text("Time ").addClass("facet-range-choice-label").appendTo(timeLabel);
-    $('<div>').text(this._timeCount).addClass("facet-range-choice-count").appendTo(timeLabel);
+  var facet_id = this._div.attr("id");
 
-    // ----------------- non-Time -----------------
-    
-    var nonTimeDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
-    var nonTimeCheck = $('<input type="checkbox" />').attr("id",facet_id + "-non-time").appendTo(nonTimeDiv).change(function() {
-        self._selectNonTime = !self._selectNonTime;
-        self._updateRest();
-    });
-    if (this._selectNonTime) nonTimeCheck.attr("checked","checked");
-    
-    var nonTimeLabel = $('<label>').attr("for", facet_id + "-non-time").appendTo(nonTimeDiv);    
-    $('<span>').text("Non-Time ").addClass("facet-range-choice-label").appendTo(nonTimeLabel);
-    $('<div>').text(this._nonTimeCount).addClass("facet-range-choice-count").appendTo(nonTimeLabel);
+  var choices = $('<div>').addClass("facet-range-choices");
 
-    if (this._baseNonTimeCount === 0) nonTimeCheck.removeAttr("checked");
-    
-    // ----------------- blank -----------------
-    
-    var blankDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
-    var blankCheck = $('<input type="checkbox" />').attr("id",facet_id + "-blank").appendTo(blankDiv).change(function() {
-        self._selectBlank = !self._selectBlank;
-        self._updateRest();
-    });
-    if (this._selectBlank) blankCheck.attr("checked","checked");
+  // ----------------- time -----------------
 
-    var blankLabel = $('<label>').attr("for", facet_id + "-blank").appendTo(blankDiv);    
-    $('<span>').text("Blank ").addClass("facet-range-choice-label").appendTo(blankLabel);
-    $('<div>').text(this._blankCount).addClass("facet-range-choice-count").appendTo(blankLabel);
+  var timeDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
+  var timeCheck = $('<input type="checkbox" />').attr("id",facet_id + "-time").appendTo(timeDiv).change(function() {
+    self._selectTime = !self._selectTime;
+    self._updateRest();
+  });
+  if (this._selectTime) timeCheck.attr("checked","checked");
 
-    if (this._baseBlankCount === 0) blankCheck.removeAttr("checked");
-    
-    // ----------------- error -----------------
+  var timeLabel = $('<label>').attr("for", facet_id + "-time").appendTo(timeDiv);    
+  $('<span>').text("Time ").addClass("facet-range-choice-label").appendTo(timeLabel);
+  $('<div>').text(this._timeCount).addClass("facet-range-choice-count").appendTo(timeLabel);
 
-    var errorDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
-    var errorCheck = $('<input type="checkbox" />').attr("id",facet_id + "-error").appendTo(errorDiv).change(function() {
-        self._selectError = !self._selectError;
-        self._updateRest();
-    });
-    if (this._selectError) errorCheck.attr("checked","checked");
+  // ----------------- non-Time -----------------
 
-    var errorLabel = $('<label>').attr("for", facet_id + "-error").appendTo(errorDiv);    
-    $('<span>').text("Error ").addClass("facet-range-choice-label").appendTo(errorLabel);
-    $('<div>').text(this._errorCount).addClass("facet-range-choice-count").appendTo(errorLabel);
+  var nonTimeDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
+  var nonTimeCheck = $('<input type="checkbox" />').attr("id",facet_id + "-non-time").appendTo(nonTimeDiv).change(function() {
+    self._selectNonTime = !self._selectNonTime;
+    self._updateRest();
+  });
+  if (this._selectNonTime) nonTimeCheck.attr("checked","checked");
 
-    if (this._baseErrorCount === 0) errorCheck.removeAttr("checked");
+  var nonTimeLabel = $('<label>').attr("for", facet_id + "-non-time").appendTo(nonTimeDiv);    
+  $('<span>').text("Non-Time ").addClass("facet-range-choice-label").appendTo(nonTimeLabel);
+  $('<div>').text(this._nonTimeCount).addClass("facet-range-choice-count").appendTo(nonTimeLabel);
 
-    // --------------------------
-    
-    choices.appendTo(container);
+  if (this._baseNonTimeCount === 0) nonTimeCheck.removeAttr("checked");
+
+  // ----------------- blank -----------------
+
+  var blankDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
+  var blankCheck = $('<input type="checkbox" />').attr("id",facet_id + "-blank").appendTo(blankDiv).change(function() {
+    self._selectBlank = !self._selectBlank;
+    self._updateRest();
+  });
+  if (this._selectBlank) blankCheck.attr("checked","checked");
+
+  var blankLabel = $('<label>').attr("for", facet_id + "-blank").appendTo(blankDiv);    
+  $('<span>').text("Blank ").addClass("facet-range-choice-label").appendTo(blankLabel);
+  $('<div>').text(this._blankCount).addClass("facet-range-choice-count").appendTo(blankLabel);
+
+  if (this._baseBlankCount === 0) blankCheck.removeAttr("checked");
+
+  // ----------------- error -----------------
+
+  var errorDiv = $('<div class="facet-range-item"></div>').appendTo(choices);            
+  var errorCheck = $('<input type="checkbox" />').attr("id",facet_id + "-error").appendTo(errorDiv).change(function() {
+    self._selectError = !self._selectError;
+    self._updateRest();
+  });
+  if (this._selectError) errorCheck.attr("checked","checked");
+
+  var errorLabel = $('<label>').attr("for", facet_id + "-error").appendTo(errorDiv);    
+  $('<span>').text("Error ").addClass("facet-range-choice-label").appendTo(errorLabel);
+  $('<div>').text(this._errorCount).addClass("facet-range-choice-count").appendTo(errorLabel);
+
+  if (this._baseErrorCount === 0) errorCheck.removeAttr("checked");
+
+  // --------------------------
+
+  choices.appendTo(container);
 };
 
 TimeRangeFacet.prototype.steps = [ 
-  	1,                  // msec
-  	1000,               // sec
-  	1000*60,            // min
-  	1000*60*60,         // hour
-  	1000*60*60*24,      // day
-  	1000*60*60*24*7,    // week
-  	1000*2629746,       // month (average Gregorian year / 12)
-  	1000*31556952,      // year (average Gregorian year)
-  	1000*31556952*10,   // decade 
-  	1000*31556952*100,  // century 
-  	1000*31556952*1000, // millennium 
-];
+                                  1,                  // msec
+                                  1000,               // sec
+                                  1000*60,            // min
+                                  1000*60*60,         // hour
+                                  1000*60*60*24,      // day
+                                  1000*60*60*24*7,    // week
+                                  1000*2629746,       // month (average Gregorian year / 12)
+                                  1000*31556952,      // year (average Gregorian year)
+                                  1000*31556952*10,   // decade 
+                                  1000*31556952*100,  // century 
+                                  1000*31556952*1000, // millennium 
+                                  ];
 
 TimeRangeFacet.prototype._setRangeIndicators = function() {
-	var fromDate = new Date(this._from);
-	var toDate = new Date(this._to);
+  var fromDate = new Date(this._from);
+  var toDate = new Date(this._to);
 
-	if (this._step > 2629746000) { // > month
-		var format = "yyyy";
-	    this._elmts.statusDiv.html(fromDate.toString(format) + " &mdash; " + toDate.toString(format));
-	} else if (this.step > 3600000) { // > hour
-		var format = "yyyy-MM-dd";
-	    this._elmts.statusDiv.html(fromDate.toString(format) + " &mdash; " + toDate.toString(format));
-	} else {
-		var format = "HH:mm:ss";
-	    this._elmts.statusDiv.html("<b style='margin-right: 4em'>" + fromDate.toString("yyyy-MM-dd") + "</b> " + fromDate.toString(format) + " &mdash; " + toDate.toString(format));
-	}
+  if (this._step > 2629746000) { // > month
+    var format = "yyyy";
+    this._elmts.statusDiv.html(fromDate.toString(format) + " &mdash; " + toDate.toString(format));
+  } else if (this.step > 3600000) { // > hour
+    var format = "yyyy-MM-dd";
+    this._elmts.statusDiv.html(fromDate.toString(format) + " &mdash; " + toDate.toString(format));
+  } else {
+    var format = "HH:mm:ss";
+    this._elmts.statusDiv.html("<b style='margin-right: 4em'>" + fromDate.toString("yyyy-MM-dd") + "</b> " + fromDate.toString(format) + " &mdash; " + toDate.toString(format));
+  }
 };
 
 TimeRangeFacet.prototype._addCommas = function(nStr) {
-    nStr += '';
-    x = nStr.split('.');
-    x1 = x[0];
-    x2 = x.length > 1 ? '.' + x[1] : '';
-    var rgx = /(\d+)(\d{3})/;
-    while (rgx.test(x1)) {
-        x1 = x1.replace(rgx, '$1' + ',' + '$2');
-    }
-    return x1 + x2;
+  nStr += '';
+  x = nStr.split('.');
+  x1 = x[0];
+  x2 = x.length > 1 ? '.' + x[1] : '';
+  var rgx = /(\d+)(\d{3})/;
+  while (rgx.test(x1)) {
+    x1 = x1.replace(rgx, '$1' + ',' + '$2');
+  }
+  return x1 + x2;
 };
 
 TimeRangeFacet.prototype.updateState = function(data) {
-    if ("min" in data && "max" in data) {
-        this._error = false;
-        
-        this._config.min = data.min;
-        this._config.max = data.max;
-        this._config.step = data.step;
-        this._baseBins = data.baseBins;
-        this._bins = data.bins;
-        
-        switch (this._config.mode) {
-        case "min":
-            this._from = Math.max(data.from, this._config.min);
-            break;
-        case "max":
-            this._to = Math.min(data.to, this._config.max);
-            break;
-        default:
-            this._from = Math.max(data.from, this._config.min);
-            if ("to" in data) {
-                this._to = Math.min(data.to, this._config.max);
-            } else {
-                this._to = data.max;
-            }
-        }
-        
-        this._baseTimeCount = data.baseTimeCount;
-        this._baseNonTimeCount = data.baseNonTimeCount;
-        this._baseBlankCount = data.baseBlankCount;
-        this._baseErrorCount = data.baseErrorCount;
+  if ("min" in data && "max" in data) {
+    this._error = false;
 
-        this._timeCount = data.timeCount;
-        this._nonTimeCount = data.nonTimeCount;
-        this._blankCount = data.blankCount;
-        this._errorCount = data.errorCount;
+    this._config.min = data.min;
+    this._config.max = data.max;
+    this._config.step = data.step;
+    this._baseBins = data.baseBins;
+    this._bins = data.bins;
+
+    switch (this._config.mode) {
+    case "min":
+      this._from = Math.max(data.from, this._config.min);
+      break;
+    case "max":
+      this._to = Math.min(data.to, this._config.max);
+      break;
+    default:
+      this._from = Math.max(data.from, this._config.min);
+    if ("to" in data) {
+      this._to = Math.min(data.to, this._config.max);
     } else {
-        this._error = true;
-        this._errorMessage = "error" in data ? data.error : "Unknown error.";
+      this._to = data.max;
     }
-    
-    this.render();
+    }
+
+    this._baseTimeCount = data.baseTimeCount;
+    this._baseNonTimeCount = data.baseNonTimeCount;
+    this._baseBlankCount = data.baseBlankCount;
+    this._baseErrorCount = data.baseErrorCount;
+
+    this._timeCount = data.timeCount;
+    this._nonTimeCount = data.nonTimeCount;
+    this._blankCount = data.blankCount;
+    this._errorCount = data.errorCount;
+  } else {
+    this._error = true;
+    this._errorMessage = "error" in data ? data.error : "Unknown error.";
+  }
+
+  this.render();
 };
 
 TimeRangeFacet.prototype.render = function() {
-    if (!this._initializedUI) {
-        this._initializeUI();
-        this._initializedUI = true;
-    }
-    
-    if (this._error) {
-        this._elmts.messageDiv.text(this._errorMessage).show();
-        this._elmts.sliderWidgetDiv.hide();
-        this._elmts.histogramDiv.hide();
-        this._elmts.statusDiv.hide();
-        this._elmts.otherChoicesDiv.hide();
-        return;
-    }
-    
-    this._elmts.messageDiv.hide();
-    this._elmts.sliderWidgetDiv.show();
-    this._elmts.histogramDiv.show();
-    this._elmts.statusDiv.show();
-    this._elmts.otherChoicesDiv.show();
-    
-    this._sliderWidget.update(
-        this._config.min, 
-        this._config.max, 
-        this._config.step, 
-        this._from,
-        this._to
-    );
-    this._histogram.update(
-        this._config.min, 
-        this._config.max, 
-        this._config.step, 
-        [ this._baseBins, this._bins ]
-    );
-    
-    this._setRangeIndicators();
-    this._renderOtherChoices();
+  if (!this._initializedUI) {
+    this._initializeUI();
+    this._initializedUI = true;
+  }
+
+  if (this._error) {
+    this._elmts.messageDiv.text(this._errorMessage).show();
+    this._elmts.sliderWidgetDiv.hide();
+    this._elmts.histogramDiv.hide();
+    this._elmts.statusDiv.hide();
+    this._elmts.otherChoicesDiv.hide();
+    return;
+  }
+
+  this._elmts.messageDiv.hide();
+  this._elmts.sliderWidgetDiv.show();
+  this._elmts.histogramDiv.show();
+  this._elmts.statusDiv.show();
+  this._elmts.otherChoicesDiv.show();
+
+  this._sliderWidget.update(
+      this._config.min, 
+      this._config.max, 
+      this._config.step, 
+      this._from,
+      this._to
+  );
+  this._histogram.update(
+      this._config.min, 
+      this._config.max, 
+      this._config.step, 
+      [ this._baseBins, this._bins ]
+  );
+
+  this._setRangeIndicators();
+  this._renderOtherChoices();
 };
 
 TimeRangeFacet.prototype._remove = function() {
-    ui.browsingEngine.removeFacet(this);
-    
-    this._div = null;
-    this._config = null;
-    this._data = null;
+  ui.browsingEngine.removeFacet(this);
+
+  this._div = null;
+  this._config = null;
+  this._data = null;
 };
 
 TimeRangeFacet.prototype._updateRest = function() {
-    Refine.update({ engineChanged: true });
+  Refine.update({ engineChanged: true });
 };
 
 TimeRangeFacet.prototype._editExpression = function() {
-    var self = this;
-    var title = (this._config.columnName) ? 
-            ("Edit Facet's Expression based on Column " + this._config.columnName) : 
-            "Edit Facet's Expression";
-    
-    var column = Refine.columnNameToColumn(this._config.columnName);
-    var o = DataTableView.sampleVisibleRows(column);
-    
-    new ExpressionPreviewDialog(
-        title,
-        column ? column.cellIndex : -1, 
-        o.rowIndices,
-        o.values,
-        this._config.expression, 
-        function(expr) {
+  var self = this;
+  var title = (this._config.columnName) ? 
+      ("Edit Facet's Expression based on Column " + this._config.columnName) : 
+        "Edit Facet's Expression";
+
+      var column = Refine.columnNameToColumn(this._config.columnName);
+      var o = DataTableView.sampleVisibleRows(column);
+
+      new ExpressionPreviewDialog(
+          title,
+          column ? column.cellIndex : -1, 
+              o.rowIndices,
+              o.values,
+              this._config.expression, 
+              function(expr) {
             if (expr != self._config.expression) {
-                self._config.expression = expr;
-                self._elmts.expressionDiv.text(self._config.expression);
-                
-                self.reset();
-                self._from = null;
-                self._to = null;
-                self._updateRest();
+              self._config.expression = expr;
+              self._elmts.expressionDiv.text(self._config.expression);
+
+              self.reset();
+              self._from = null;
+              self._to = null;
+              self._updateRest();
             }
-        }
-    );
+          }
+      );
 };
\ No newline at end of file