diff --git a/web/client/components/data/featuregrid/DockedFeatureGrid.jsx b/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
index 03ef556b56..960f201de8 100644
--- a/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
+++ b/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
@@ -3,7 +3,7 @@ const {connect} = require('react-redux');
 const {isObject} = require('lodash');
 const Dock = require('react-dock');
 
-const {Modal, Panel, Grid, Row, Col, Button} = require('react-bootstrap');
+const {Modal} = require('react-bootstrap');
 
 const FilterUtils = require('../../../utils/FilterUtils');
 
@@ -15,11 +15,12 @@ const FeatureGrid = connect((state) => {
     };
 }, {})(require('./FeatureGrid'));
 
-const LocaleUtils = require('../../../utils/LocaleUtils');
 const I18N = require('../../../components/I18N/I18N');
 const Spinner = require('react-spinkit');
 const assign = require('object-assign');
 
+require("./featuregrid.css");
+
 const DockedFeatureGrid = React.createClass({
     propTypes: {
         open: React.PropTypes.bool,
@@ -60,7 +61,8 @@ const DockedFeatureGrid = React.createClass({
         cleanError: React.PropTypes.func,
         selectAllToggle: React.PropTypes.func,
         templateProfile: React.PropTypes.string,
-        zoomToFeatureAction: React.PropTypes.func
+        zoomToFeatureAction: React.PropTypes.func,
+        style: React.PropTypes.object
     },
     contextTypes: {
         messages: React.PropTypes.object
@@ -129,10 +131,6 @@ const DockedFeatureGrid = React.createClass({
         }, false);
     },
     componentWillUpdate(nextProps) {
-        if (nextProps.initWidth !== this.props.initWidth) {
-            let height = getWindowSize().maxHeight - 108;
-            this.setState({width: `calc( ${this.props.initWidth} - 30px)`, height});
-        }
         if (!nextProps.loadingGrid && nextProps.pagination && (nextProps.dataSourceOptions !== this.props.dataSourceOptions)) {
             this.dataSource = this.getDataSource(nextProps.dataSourceOptions);
         }
@@ -193,24 +191,6 @@ const DockedFeatureGrid = React.createClass({
             overflowSize: 20
         };
     },
-    renderHeader() {
-        const header = LocaleUtils.getMessageById(this.context.messages, this.props.header);
-
-        return (
-            <div className="handle_featuregrid">
-                <Grid className="featuregrid-title" fluid={true}>
-                    <Row>
-                        <Col xs={11} sm={11} md={11} lg={11}>
-                            <span>{header}</span>
-                        </Col>
-                        <Col xs={1} sm={1} md={1} lg={1}>
-                            <button onClick={() => this.onGridClose(false)} className="close grid-close"><span>X</span></button>
-                        </Col>
-                    </Row>
-                </Grid>
-            </div>
-        );
-    },
     renderLoadingException(loadingError, msg) {
         let exception;
         if (isObject(loadingError)) {
@@ -269,54 +249,53 @@ const DockedFeatureGrid = React.createClass({
                     position={"bottom" /* 'left', 'top', 'right', 'bottom' */}
                     size={this.state.size}
                     dimMode={"none" /*'transparent', 'none', 'opaque'*/}
-                    isVisible={this.state.isVisible || true}
+                    isVisible={true}
                     onVisibleChange={this.handleVisibleChange}
-                    onSizeChange={this.handleSizeChange}
                     fluid={true}
                     dimStyle={{ background: 'rgba(0, 0, 100, 0.2)' }}
                     dockStyle={null}
                     dockHiddenStyle={null} >
-                    <Panel className="featuregrid-container sidepanel-featuregrid" collapsible expanded={this.props.expanded} header={this.renderHeader()} bsStyle="primary">
-                            <div style={this.props.loadingGrid ? {display: "none"} : {height: this.state.height, width: this.state.width}}>
-                                <Button
-                                    style={{marginBottom: "12px"}}
-                                    onClick={() => this.onGridClose(true)}><span>Torna al pannello di ricerca</span>
-                                </Button>
-                                <h5>Risultati - {this.props.totalFeatures !== -1 ? this.props.totalFeatures : (<I18N.Message msgId={"sira.noQueryResult"}/>)}</h5>
-
-                                <FeatureGrid
-                                    changeMapView={this.props.changeMapView}
-                                    srs="EPSG:4326"
-                                    map={this.props.map}
-                                    columnDefs={cols}
-                                    style={{height: this.state.height - 120, width: this.state.width}}
-                                    maxZoom={16}
-                                    selectFeatures={this.selectFeatures}
-                                    selectAll={this.selectAll}
-                                    paging={this.props.pagination}
-                                    zoom={15}
-                                    enableZoomToFeature={this.props.withMap}
-                                    agGridOptions={{enableServerSideSorting: true, suppressMultiSort: true}}
-                                    zoomToFeatureAction={this.props.zoomToFeatureAction}
-                                    toolbar={{
-                                        zoom: this.props.withMap,
-                                        exporter: true,
-                                        toolPanel: true,
-                                        selectAll: true
-                                    }}
-                                    {...gridConf}
-                                    />
+                    {this.props.loadingGrid ?
+                        <div style={{height: "300px", width: this.state.width}}>
+                            <div style={{
+                                position: "relative",
+                                width: "60px",
+                                top: "50%",
+                                left: "45%"}}>
+                                <Spinner style={{width: "60px"}} spinnerName="three-bounce" noFadeIn/>
                             </div>
-                            {this.props.loadingGrid ? (<div style={{height: "300px", width: this.state.width}}>
-                                <div style={{
-                                    position: "relative",
-                                    width: "60px",
-                                    top: "50%",
-                                    left: "45%"}}>
-                                    <Spinner style={{width: "60px"}} spinnerName="three-bounce" noFadeIn/>
-                                </div>
-                            </div>) : null}
-                    </Panel>
+                        </div> :
+                        <div style={{
+                                height: "100%"
+                                }}>
+                            <FeatureGrid
+                                className="featureGrid"
+                                changeMapView={this.props.changeMapView}
+                                srs="EPSG:4326"
+                                map={this.props.map}
+                                columnDefs={cols}
+                                style={{
+                                    flex: "1 0 auto",
+                                    width: "100%",
+                                    height: "calc(100% - 32px )"
+                                }}
+                                maxZoom={16}
+                                selectFeatures={this.selectFeatures}
+                                selectAll={this.selectAll}
+                                paging={this.props.pagination}
+                                zoom={15}
+                                enableZoomToFeature={this.props.withMap}
+                                agGridOptions={{enableServerSideSorting: true, suppressMultiSort: true}}
+                                zoomToFeatureAction={this.props.zoomToFeatureAction}
+                                toolbar={{
+                                    zoom: this.props.withMap,
+                                    exporter: true,
+                                    toolPanel: true,
+                                    selectAll: true
+                                }}
+                                {...gridConf}
+                                />
+                        </div>}
                 </Dock>
             );
         }
diff --git a/web/client/components/data/featuregrid/FeatureGrid.jsx b/web/client/components/data/featuregrid/FeatureGrid.jsx
index 4b02925b91..72b355e363 100644
--- a/web/client/components/data/featuregrid/FeatureGrid.jsx
+++ b/web/client/components/data/featuregrid/FeatureGrid.jsx
@@ -63,7 +63,10 @@ const FeatureGrid = React.createClass({
             columnDefs: null,
             changeMapView: () => {},
             selectFeatures: () => {},
-            style: {height: "400px", width: "800px"},
+            style: {
+                height: "400px",
+                width: "800px"
+            },
             virtualPaging: false,
             paging: false,
             overflowSize: 10,
@@ -179,40 +182,44 @@ const FeatureGrid = React.createClass({
         }
 
         return (
-            <div>
-            <div fluid={false} style={this.props.style} className="ag-fresh">
-                <AgGridReact
-                    virtualPaging={this.props.virtualPaging}
-                    columnDefs={this.setColumnDefs()}
-                    rowData={(!isPagingOrVirtual) ? this.props.features : null}
-                    datasource={(isPagingOrVirtual) ? this.setDataSource() : null}
-                    enableServerSideSorting={(isPagingOrVirtual)}
-                    // or provide props the old way with no binding
-                    onSelectionChanged={this.selectFeatures}
-                    rowSelection="multiple"
-                    enableColResize={true}
-                    enableSorting={(!isPagingOrVirtual)}
-                    toolPanelSuppressValues={true}
-                    toolPanelSuppressGroups={true}
-                    showToolPanel={false}
-                    rowDeselection={true}
-                    localeText={{
-                        page: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.page") || 'Page',
-                        of: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.of") || 'of',
-                        to: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.to") || 'to',
-                        more: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.more") || 'more',
-                        next: '>',
-                        last: '>|',
-                        first: '|<',
-                        previous: '<'}}
-                    onGridReady={this.onGridReady}
-                    {...this.props.agGridOptions}
-                />
-            </div>
+            <div style={{
+                display: "flex",
+                flexDirection: "column",
+                height: "100%"
+            }}>
+                <div fluid={false} style={this.props.style} className="ag-fresh">
+                    <AgGridReact
+                        virtualPaging={this.props.virtualPaging}
+                        columnDefs={this.setColumnDefs()}
+                        rowData={(!isPagingOrVirtual) ? this.props.features : null}
+                        datasource={(isPagingOrVirtual) ? this.setDataSource() : null}
+                        enableServerSideSorting={(isPagingOrVirtual)}
+                        // or provide props the old way with no binding
+                        onSelectionChanged={this.selectFeatures}
+                        rowSelection="multiple"
+                        enableColResize={true}
+                        enableSorting={(!isPagingOrVirtual)}
+                        toolPanelSuppressValues={true}
+                        toolPanelSuppressGroups={true}
+                        showToolPanel={false}
+                        rowDeselection={true}
+                        localeText={{
+                            page: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.page") || 'Page',
+                            of: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.of") || 'of',
+                            to: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.to") || 'to',
+                            more: LocaleUtils.getMessageById(this.context.messages, "featuregrid.pagination.more") || 'more',
+                            next: '>',
+                            last: '>|',
+                            first: '|<',
+                            previous: '<'}}
+                        onGridReady={this.onGridReady}
+                        {...this.props.agGridOptions}
+                    />
+                </div>
 
-            <ButtonToolbar style={{marginTop: "5px", marginLeft: "0px"}}bsSize="sm">
-                {tools.map((tool) => tool)}
-            </ButtonToolbar>
+                <ButtonToolbar style={{marginTop: "5px", marginLeft: "0px", flex: "none"}} bsSize="sm">
+                    {tools.map((tool) => tool)}
+                </ButtonToolbar>
             </div>);
     },
     // If props.columnDefs is missing try to generate from features, add zoomTo as first column
diff --git a/web/client/components/data/featuregrid/ZoomToFeatureRenderer.jsx b/web/client/components/data/featuregrid/ZoomToFeatureRenderer.jsx
index 2fb44d6707..017581d1a5 100644
--- a/web/client/components/data/featuregrid/ZoomToFeatureRenderer.jsx
+++ b/web/client/components/data/featuregrid/ZoomToFeatureRenderer.jsx
@@ -13,7 +13,7 @@ const ZoomToFeatureRenderer = React.createClass({
         params: React.PropTypes.object
     },
     render() {
-        const geometry = this.props.params.data.geometry;
+        const geometry = this.props.params && this.props.params.data && this.props.params.data.geometry;
         return geometry && geometry.coordinates ? (
             <img src={img} width={16}/>
         ) : null;
diff --git a/web/client/components/data/featuregrid/featuregrid.css b/web/client/components/data/featuregrid/featuregrid.css
index e69de29bb2..d5ed283e9f 100644
--- a/web/client/components/data/featuregrid/featuregrid.css
+++ b/web/client/components/data/featuregrid/featuregrid.css
@@ -0,0 +1,5 @@
+.featuregrid .ag-header-cell, .ag-header-row{
+    background-color: #078AA3;
+    color: white;
+    font-family: Raleway;
+}
diff --git a/web/client/components/data/query/queryform.css b/web/client/components/data/query/queryform.css
index 7c2a574ef4..754a04afec 100644
--- a/web/client/components/data/query/queryform.css
+++ b/web/client/components/data/query/queryform.css
@@ -114,6 +114,7 @@
     overflow-x: hidden;
     overflow-y: auto;
     border: none;
+    min-width: 700px;
 }
 
 .queryFormToolbar{
diff --git a/web/client/examples/queryform/components/Results.jsx b/web/client/examples/queryform/components/Results.jsx
index c046905352..ff59c80fc9 100644
--- a/web/client/examples/queryform/components/Results.jsx
+++ b/web/client/examples/queryform/components/Results.jsx
@@ -13,7 +13,7 @@ const JSONViewer = require('../../../components/data/identify/viewers/JSONViewer
 const {Panel} = require('react-bootstrap');
 const Draggable = require('react-draggable');
 
-const {resetQuery} = require('../actions/wfsquery');
+const {resetQuery} = require('../actions/query');
 
 const Results = React.createClass({
     propTypes: {
diff --git a/web/client/plugins/FeatureGrid.jsx b/web/client/plugins/FeatureGrid.jsx
index 4d89a0f02c..ff4f5a235e 100644
--- a/web/client/plugins/FeatureGrid.jsx
+++ b/web/client/plugins/FeatureGrid.jsx
@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 const {connect} = require('react-redux');
+const {updateHighlighted} = require('../actions/highlight');
 
 module.exports = {
     FeatureGridPlugin: connect((state) => ({
@@ -21,5 +22,8 @@ module.exports = {
                 field: attr.attribute
             })),
         totalFeatures: state.query && state.query.result && state.query.result.totalFeatures
-    }))(require('../components/data/featuregrid/DockedFeatureGrid'))
+    }),
+    {
+        selectFeatures: updateHighlighted
+    })(require('../components/data/featuregrid/DockedFeatureGrid'))
 };
diff --git a/web/client/reducers/query.js b/web/client/reducers/query.js
index 9c3823ee13..0b5528b439 100644
--- a/web/client/reducers/query.js
+++ b/web/client/reducers/query.js
@@ -68,7 +68,7 @@ const extractData = (feature) => {
 const initialState = {
     featureTypes: {},
     data: {},
-    result: '',
+    result: null,
     resultError: null
 };
 
@@ -108,14 +108,14 @@ function query(state = initialState, action) {
         }
         case QUERY_ERROR: {
             return assign({}, state, {
-                result: '',
+                result: null,
                 resultError: action.error
             });
         }
         case QUERY_FORM_RESET:
         case RESET_QUERY: {
             return assign({}, state, {
-                result: '',
+                result: null,
                 resultError: null
             });
         }