diff --git a/web/client/components/data/featuregrid/DockedFeatureGrid.jsx b/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
index f4c6170f49..aa0b16174f 100644
--- a/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
+++ b/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
@@ -217,13 +217,13 @@ const DockedFeatureGrid = React.createClass({
             );
         }
 
-        let cols = this.props.columnsDef.map((column) => {
+        let cols = this.props.columnsDef && this.props.columnsDef.map((column) => {
             if (!column.profiles || (column.profiles && column.profiles.indexOf(this.props.profile) !== -1)) {
                 return assign({}, column, {field: "properties." + column.field});
             }
         }).filter((c) => c);
 
-        if (this.sortModel && this.sortModel.length > 0) {
+        if (cols && this.sortModel && this.sortModel.length > 0) {
             cols = cols.map((c) => {
                 let model = head(this.sortModel.filter((m) => m.colId === c.field));
                 if ( model ) {
@@ -235,7 +235,7 @@ const DockedFeatureGrid = React.createClass({
 
         let gridConf = this.props.pagination ? {dataSource: this.getDataSource(this.props.dataSourceOptions), features: []} : {features: this.props.features};
 
-        if (this.props.filterObj) {
+        if (this.props.filterObj && cols) {
             return (
                 <Dock
                     position={"bottom" /* 'left', 'top', 'right', 'bottom' */}
diff --git a/web/client/plugins/TOC.jsx b/web/client/plugins/TOC.jsx
index 86a25a48cc..d847c7e184 100644
--- a/web/client/plugins/TOC.jsx
+++ b/web/client/plugins/TOC.jsx
@@ -209,7 +209,7 @@ const LayerTree = React.createClass({
                     <DefaultLayer
                             settingsOptions={this.props.settingsOptions}
                             onToggle={this.props.onToggleLayer}
-                            onToggleQuerypanel={this.props.onToggleQuery}
+                            onToggleQuerypanel={this.props.onToggleQuery }
                             onZoom={this.props.onZoomToExtent}
                             onSettings={this.props.onSettings}
                             propertiesChangeHandler={this.props.layerPropertiesChangeHandler}
@@ -237,7 +237,7 @@ const LayerTree = React.createClass({
     },
     renderQueryPanel() {
         return (<div>
-            <Button id="query-close-button" bsStyle="primary" key="menu-button" className="square-button" onClick={this.props.onToggleQuery}><Glyphicon glyph="arrow-left"/></Button>
+            <Button id="query-close-button" bsStyle="primary" key="menu-button" className="square-button" onClick={this.props.onToggleQuery.bind(this, null, null)}><Glyphicon glyph="arrow-left"/></Button>
             <SmartQueryForm/>
         </div>);
     },