diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
index ce18a00a..1dcd93dd 100644
--- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
+++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx
@@ -1185,15 +1185,17 @@ const OpenlayersMapView = (props) => {
                       <Link
                         as="a"
                         className={
-                          !state.popupDetails.properties.nLCP
+                          !state.popupDetails.properties.nInstallations
                             ? 'disabled-link'
                             : ''
                         }
                         onClick={setSiteQueryParams}
-                        to={'/industrial-site/large-scale-fuel-combustion'}
+                        to={
+                          '/industrial-site/regulatory-information/site-overview'
+                        }
                       >
-                        {state.popupDetails.properties.nLCP || 0} Large
-                        combustion plants
+                        {state.popupDetails.properties.nInstallations || 0}{' '}
+                        Installations
                       </Link>
                     </p>
                   </div>
@@ -1202,17 +1204,15 @@ const OpenlayersMapView = (props) => {
                       <Link
                         as="a"
                         className={
-                          !state.popupDetails.properties.nInstallations
+                          !state.popupDetails.properties.nLCP
                             ? 'disabled-link'
                             : ''
                         }
                         onClick={setSiteQueryParams}
-                        to={
-                          '/industrial-site/regulatory-information/site-overview'
-                        }
+                        to={'/industrial-site/large-scale-fuel-combustion'}
                       >
-                        {state.popupDetails.properties.nInstallations || 0}{' '}
-                        Installations
+                        {state.popupDetails.properties.nLCP || 0} Large
+                        combustion plants
                       </Link>
                     </p>
                   </div>
diff --git a/src/components/manage/Blocks/GlossarySearchBlock/Edit.jsx b/src/components/manage/Blocks/GlossarySearchBlock/Edit.jsx
new file mode 100644
index 00000000..8097f625
--- /dev/null
+++ b/src/components/manage/Blocks/GlossarySearchBlock/Edit.jsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { injectIntl } from 'react-intl';
+import View from './View';
+
+import RenderFields from 'volto-addons/Widgets/RenderFields';
+
+const schema = {
+  title: {
+    title: 'Title',
+    type: 'text',
+  },
+  description: {
+    title: 'Description',
+    type: 'text',
+  },
+  placeholder: {
+    title: 'Placeholder',
+    type: 'text',
+  },
+  searchButton: {
+    title: 'Search button',
+    type: 'boolean',
+  },
+  buttonText: {
+    title: 'Button text',
+    type: 'text',
+    requires: 'searchButton',
+  },
+  className: {
+    title: 'Class name',
+    type: 'text',
+  },
+  buttonClassName: {
+    title: 'Button class name',
+    type: 'text',
+    requires: 'searchButton',
+  },
+  query: {
+    title: 'Query parameters',
+    type: 'schema',
+    fieldSetTitle: 'Query metadata',
+    fieldSetId: 'query-metadata',
+    fieldSetSchema: {
+      fieldsets: [
+        {
+          id: 'default',
+          title: 'title',
+          fields: ['title', 'id', 'value'],
+        },
+      ],
+      properties: {
+        title: {
+          type: 'string',
+          title: 'Query title',
+        },
+        id: {
+          type: 'string',
+          title: 'Query id',
+          description: 'This will be used as query parameter key',
+        },
+        value: {
+          type: 'array',
+          title: 'Values',
+        },
+      },
+      required: ['id', 'title', 'value'],
+    },
+    editFieldset: false,
+    deleteFieldset: false,
+  },
+};
+
+const Edit = (props) => {
+  if (__SERVER__) {
+    return <div />;
+  }
+  return (
+    <div>
+      <RenderFields schema={schema} {...props} title="Search block" />
+      <View {...props} />
+    </div>
+  );
+};
+
+export default compose(
+  injectIntl,
+  connect((state) => ({
+    content: state.content.data,
+  })),
+)(Edit);
diff --git a/src/components/manage/Blocks/GlossarySearchBlock/View.jsx b/src/components/manage/Blocks/GlossarySearchBlock/View.jsx
new file mode 100644
index 00000000..9d37f8e7
--- /dev/null
+++ b/src/components/manage/Blocks/GlossarySearchBlock/View.jsx
@@ -0,0 +1,380 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { Form, Input } from 'semantic-ui-react';
+import { compose } from 'redux';
+import { defineMessages, injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+import qs from 'query-string';
+import { isArray, isObject, isString } from 'lodash';
+import { Icon } from '@plone/volto/components';
+import zoomSVG from '@plone/volto/icons/zoom.svg';
+import clearSVG from '@plone/volto/icons/clear.svg';
+import { settings } from '~/config';
+import {
+  quickResetSearchContent,
+  quickSearchContent,
+} from 'volto-addons/actions';
+import Highlighter from 'react-highlight-words';
+import cx from 'classnames';
+import axios from 'axios';
+import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import './style.css';
+
+const messages = defineMessages({
+  search: {
+    id: 'Search',
+    defaultMessage: 'Search',
+  },
+  searchSite: {
+    id: 'Search Site',
+    defaultMessage: 'Search Site',
+  },
+});
+
+/**
+ * View search block component.
+ * @class View
+ * @extends Component
+ */
+class View extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      providerUrl: settings.providerUrl,
+      text: '',
+      apiRoot: new URL(settings.apiPath).pathname,
+      active: false,
+      query: {},
+      pollutants: [],
+      loading: false,
+    };
+    this.linkFormContainer = React.createRef();
+    this.linkInput = React.createRef();
+    this.onSubmit = this.onSubmit.bind(this);
+    this.handleClickOutside = this.handleClickOutside.bind(this);
+    this.onSelectItem = this.onSelectItem.bind(this);
+    this.onClose = this.onClose.bind(this);
+    this.onChange = this.onChange.bind(this);
+    this.makeQuery = this.makeQuery.bind(this);
+    this.getPollutants = this.getPollutants.bind(this);
+    this.onSelectPollutant = this.onSelectPollutant.bind(this);
+  }
+
+  componentDidMount() {
+    if (
+      this.props.data?.query?.value &&
+      isString(this.props.data.query.value)
+    ) {
+      const query = JSON.parse(this.props.data.query.value);
+      this.setState({ query });
+    } else if (
+      this.props.data?.query?.value &&
+      isObject(this.props.data.query.value)
+    ) {
+      this.setState({ query: this.props.data.query.value });
+    }
+    this.props.quickResetSearchContent();
+    document.addEventListener('mousedown', this.handleClickOutside, false);
+  }
+
+  componentWillUnmount() {
+    document.removeEventListener('mousedown', this.handleClickOutside, false);
+  }
+
+  componentDidUpdate(prevProps) {
+    if (prevProps.location?.state?.text && this.props?.location?.state?.text) {
+      if (prevProps.location.state.text !== this.props.location.state.text) {
+        this.setState(
+          {
+            text: this.props?.location?.state?.text,
+          },
+          () => {
+            const title = this.props.data?.title
+              ? `&title=${this.props.data.title.value}`
+              : '';
+            const description = this.props.data?.description
+              ? `&description=${this.props.data.description.value}`
+              : '';
+            this.props.history.push({
+              pathname: `/search`,
+              search: `?SearchableText=${
+                this.state.text
+              }${this.makeQuery()}${title}${description}`,
+              state: { text: this.state.text },
+            });
+          },
+        );
+      }
+    }
+    if (prevProps.data.query?.value !== this.props.data.query?.value) {
+      if (
+        this.props.data.query.value &&
+        isString(this.props.data.query.value)
+      ) {
+        const query = JSON.parse(this.props.data.query.value);
+        this.setState({ query });
+      } else if (
+        this.props.data.query.value &&
+        isObject(this.props.data.query.value)
+      ) {
+        this.setState({ query: this.props.data.query.value });
+      }
+    }
+  }
+
+  onSubmit(event) {
+    const title = this.props.data?.title
+      ? `&title=${this.props.data.title.value}`
+      : '';
+    const description = this.props.data?.description
+      ? `&description=${this.props.data.description.value}`
+      : '';
+    this.props.history.push({
+      pathname: `/search`,
+      search: `?SearchableText=${
+        this.state.text
+      }${this.makeQuery()}${title}${description}`,
+      state: { text: this.state.text },
+    });
+    this.setState({ active: false });
+    event && event.preventDefault();
+  }
+
+  handleClickOutside(e) {
+    if (
+      this.linkFormContainer &&
+      !this.linkFormContainer.current.contains(e.target)
+    ) {
+      return this.setState({ active: false });
+    } else {
+      this.setState({ active: true });
+    }
+  }
+
+  onChange(event, { value }) {
+    if (value && value !== '') {
+      this.props.quickSearchContent('', {
+        SearchableText: `*${value}*`,
+        ...this.makeQueryObject(),
+      });
+    } else {
+      this.props.quickResetSearchContent();
+    }
+    this.getPollutants(value);
+    this.setState({ text: value });
+  }
+
+  onSelectItem(item) {
+    item?.['@id'] && this.props.history.push(item['@id']);
+  }
+
+  onSelectPollutant(pollutant) {
+    this.props.setQueryParam({
+      queryParam: {
+        index_pollutant_group_id: parseInt(pollutant.parentId),
+        index_pollutant_id: parseInt(pollutant.pollutantId),
+      },
+    });
+    this.props.history.push('/glossary/pollutants/pollutant-index');
+  }
+
+  onClose() {
+    this.props.quickResetSearchContent();
+    this.setState({ active: false });
+  }
+
+  makeQuery() {
+    let query = '';
+    this.state.query.properties &&
+      isObject(this.state.query.properties) &&
+      Object.entries(this.state.query.properties).forEach(([itemKey, item]) => {
+        if (isArray(item.value)) {
+          item.value.forEach((value) => {
+            query += `&${itemKey}:query=${value}`;
+          });
+        } else if (item.value) {
+          query += `&${itemKey}:query=${item.value}`;
+        }
+      });
+    return query;
+  }
+
+  makeQueryObject() {
+    const queryObj = {};
+    this.state.query.properties &&
+      isObject(this.state.query.properties) &&
+      Object.entries(this.state.query.properties).forEach(([itemKey, item]) => {
+        if (isArray(item.value)) {
+          queryObj[itemKey] = item.value;
+        } else if (item.value) {
+          queryObj[itemKey] = [];
+          queryObj[itemKey].push(item.value);
+        }
+      });
+    return queryObj;
+  }
+
+  getPollutants(name) {
+    if (name) {
+      const sql = `SELECT POL.name,
+      POL_DET.pollutantId,
+      POL.parentId
+      FROM [IED].[latest].[LOV_POLLUTANT] as POL
+      LEFT JOIN [IED].[latest].[pollutants_details_table] AS POL_DET
+      ON POL.pollutantId = POL_DET.pollutantId
+      WHERE name LIKE '%${name}%'
+      ORDER BY name`;
+      this.setState({ loading: true });
+      axios
+        .get(this.state.providerUrl + `?query=${encodeURI(sql)}`)
+        .then((response) => {
+          this.setState({ pollutants: response.data.results, loading: false });
+        })
+        .catch((error) => {
+          this.setState({ pollutants: [], loading: false });
+        });
+    } else {
+      this.setState({ pollutants: [], loading: false });
+    }
+  }
+
+  render() {
+    return (
+      <div ref={this.linkFormContainer}>
+        <Form
+          className="searchform"
+          autoComplete="off"
+          action="/search"
+          onSubmit={this.onSubmit}
+        >
+          <Form.Field className="searchbox">
+            <div
+              style={{
+                width: '100%',
+                position: 'relative',
+                marginRight: this.props.data?.searchButton?.value
+                  ? '1rem'
+                  : '0',
+              }}
+            >
+              <Icon
+                className="searchIcon"
+                onClick={this.onSubmit}
+                name={zoomSVG}
+                size="26px"
+              />
+              <Input
+                className={cx(this.props.data.className?.value)}
+                ref={this.linkInput}
+                aria-label={this.props.intl.formatMessage(messages.search)}
+                placeholder={
+                  this.props.data?.placeholder?.value ||
+                  this.props.intl.formatMessage(messages.searchSite)
+                }
+                title={this.props.intl.formatMessage(messages.search)}
+                onChange={this.onChange}
+                value={this.state.text}
+                name="SearchableText"
+                transparent
+              />
+              {this.state.text.length ? (
+                <Icon
+                  className="clearIcon"
+                  name={clearSVG}
+                  size="26px"
+                  onClick={() => {
+                    this.setState({
+                      text: '',
+                    });
+                    this.onClose();
+                  }}
+                />
+              ) : (
+                ''
+              )}
+              {this.state.active &&
+              this.props.search &&
+              !this.state.loading &&
+              (this.props.search.length || this.state.pollutants.length) ? (
+                <ul className="floating_search_results">
+                  {this.props.search.map((item, index) => {
+                    return (
+                      <li
+                        key={`${index}_${item['@id']}`}
+                        onClick={() => this.onSelectItem(item)}
+                        role="presentation"
+                      >
+                        <Highlighter
+                          highlightClassName="highlight"
+                          searchWords={this.state.text?.split(' ') || []}
+                          autoEscape={true}
+                          textToHighlight={item.title}
+                        />
+                      </li>
+                    );
+                  })}
+                  {this.state.pollutants
+                    .filter((pollutant) => pollutant.pollutantId)
+                    .map((pollutant, index) => {
+                      return (
+                        <li
+                          key={`${index}_${pollutant.pollutantId}`}
+                          onClick={() => this.onSelectPollutant(pollutant)}
+                          role="presentation"
+                        >
+                          <Highlighter
+                            highlightClassName="highlight"
+                            searchWords={this.state.text?.split(' ') || []}
+                            autoEscape={true}
+                            textToHighlight={pollutant.name}
+                          />
+                        </li>
+                      );
+                    })}
+                </ul>
+              ) : (
+                ''
+              )}
+            </div>
+            {this.props.data?.searchButton?.value ? (
+              <button
+                aria-label={this.props.intl.formatMessage(messages.search)}
+                className={this.props.data?.buttonClassName?.value}
+              >
+                {this.props.data?.buttonText?.value}
+              </button>
+            ) : (
+              ''
+            )}
+          </Form.Field>
+        </Form>
+      </div>
+    );
+  }
+}
+
+/**
+ * Property types.
+ * @property {Object} propTypes Property types.
+ * @static
+ */
+View.propTypes = {
+  //   data: PropTypes.objectOf(PropTypes.any).isRequired,
+};
+
+export default compose(
+  withRouter,
+  injectIntl,
+  connect(
+    (state, props) => ({
+      search: state.quicksearch.items,
+      path: qs.parse(props.location.search).path,
+    }),
+    {
+      quickResetSearchContent,
+      quickSearchContent,
+      setQueryParam,
+      deleteQueryParam,
+    },
+  ),
+)(View);
diff --git a/src/components/manage/Blocks/GlossarySearchBlock/style.css b/src/components/manage/Blocks/GlossarySearchBlock/style.css
new file mode 100644
index 00000000..6561cab2
--- /dev/null
+++ b/src/components/manage/Blocks/GlossarySearchBlock/style.css
@@ -0,0 +1,74 @@
+.searchbox {
+  padding: 0 !important;
+  border: none !important;
+}
+
+.searchbox div.input:not(.glossary) {
+  padding: 0 3rem;
+  border: 1px solid #606060;
+  height: 30px;
+  font-weight: 300;
+  font-size: 18px;
+  color: rgb(0, 0, 0);
+  background: rgb(255, 255, 255);
+}
+  
+.searchbox .icon {
+  fill: #606060;
+  position: absolute;
+  z-index: 1;
+  left: 1rem;
+  top: 50%;
+  transform: translateY(-50%);
+}
+  
+.searchbox .searchIcon {
+  cursor: pointer;
+}
+
+.searchbox .clearIcon {
+  left: unset;
+  right: 1rem;
+  cursor: pointer;
+}
+
+.searchbox .searchIcon,
+.searchbox .clearIcon {
+  transition: fill 0.2s;
+}
+
+.searchbox .searchIcon:hover,
+.searchbox .clearIcon:hover {
+  fill: #000;
+}
+
+
+.searchbox .floating_search_results {
+  position: absolute;
+  z-index: 98;
+  top: 100%;
+  width: 100%;
+  margin: 0;
+  list-style-type: none;
+  max-height: 264px;
+  overflow: auto;
+  margin: 0;
+  padding: 1rem;
+  padding-left: 3rem;
+  background: white;
+  color: #000;
+  border: 1px solid #EDEDED;
+  border-radius: 5px;
+  -webkit-box-shadow: 0px 2px 4px -3px rgba(0, 0, 0, 0.75);
+  -moz-box-shadow: 0px 2px 4px -3px rgba(0, 0, 0, 0.75);
+  box-shadow: 0px 2px 4px -3px rgba(0, 0, 0.75);
+}
+.searchbox li {
+  cursor: pointer;
+  font-size: .8rem;
+  line-height: 1.9;
+  margin-bottom: .5rem;
+}
+.searchbox li:hover {
+  font-weight: bold;
+}
\ No newline at end of file
diff --git a/src/components/manage/Blocks/Iframe/Edit.jsx b/src/components/manage/Blocks/Iframe/Edit.jsx
index 0f0c6533..316bcfa3 100644
--- a/src/components/manage/Blocks/Iframe/Edit.jsx
+++ b/src/components/manage/Blocks/Iframe/Edit.jsx
@@ -9,8 +9,16 @@ import './style.css';
 
 const getSchema = (props) => {
   return {
-    url: {
-      title: 'Url',
+    desktopUrl: {
+      title: 'Desktop url',
+      type: 'text',
+    },
+    tabletUrl: {
+      title: 'Tablet url',
+      type: 'text',
+    },
+    mobileUrl: {
+      title: 'Mobile url',
       type: 'text',
     },
     title: {
@@ -71,6 +79,42 @@ const getSchema = (props) => {
       editFieldset: false,
       deleteFieldset: false,
     },
+    flags: {
+      title: 'Flags',
+      type: 'schema',
+      fieldSetTitle: 'Flags',
+      fieldSetId: 'flags_parameters',
+      fieldSetSchema: {
+        fieldsets: [
+          {
+            id: 'default',
+            title: 'title',
+            fields: ['title', 'id', 'packageName', 'flag'],
+          },
+        ],
+        properties: {
+          title: {
+            title: 'Title',
+            type: 'text',
+          },
+          id: {
+            title: 'Id',
+            type: 'text',
+          },
+          packageName: {
+            title: 'Package name',
+            type: 'text',
+          },
+          flag: {
+            title: 'Flag name',
+            type: 'text',
+          },
+        },
+        required: ['id', 'title', 'packageName', 'flag'],
+      },
+      editFieldset: false,
+      deleteFieldset: false,
+    },
   };
 };
 
@@ -79,6 +123,9 @@ const Edit = (props) => {
     schema: getSchema({ ...props, providerUrl: settings.providerUrl }),
     id: _uniqueId('block_'),
   });
+  // useEffect(() => {
+
+  // }, [discodata_query, flags]);
   return (
     <div>
       <RenderFields
@@ -95,5 +142,7 @@ const Edit = (props) => {
 export default compose(
   connect((state, props) => ({
     pathname: state.router.location.pathname,
+    flags: state.flags,
+    discodata_query: state.discodata_query,
   })),
 )(Edit);
diff --git a/src/components/manage/Blocks/Iframe/View.jsx b/src/components/manage/Blocks/Iframe/View.jsx
index 20f2598a..7b6f7e52 100644
--- a/src/components/manage/Blocks/Iframe/View.jsx
+++ b/src/components/manage/Blocks/Iframe/View.jsx
@@ -1,16 +1,48 @@
 /* REACT */
-import React, { useState, useEffect } from 'react';
+import React, { useLayoutEffect, useState, useEffect } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import Iframe from 'react-iframe';
 import qs from 'query-string';
 import './style.css';
 
+const useWindowSize = () => {
+  const [size, setSize] = useState([0, 0]);
+  useLayoutEffect(() => {
+    function updateSize() {
+      setSize([window.innerWidth, window.innerHeight]);
+    }
+    window.addEventListener('resize', updateSize);
+    updateSize();
+    return () => window.removeEventListener('resize', updateSize);
+  }, []);
+  return size;
+};
+
 const View = ({ content, ...props }) => {
   const [discodataQuery, setDiscodataQuery] = useState({});
+  const [flags, setFlags] = useState({});
+  const [windowWidth, windowHeight] = useWindowSize();
+  const breakPoints = {
+    desktop: [Infinity, 992],
+    tablet: [991, 768],
+    mobile: [767, 0],
+  };
   const { data } = props;
-  const { url = '', title = '', width = '100%', height = 'auto' } = data;
+  const {
+    desktopUrl = '',
+    tabletUrl = '',
+    mobileUrl = '',
+    title = '',
+    width = '100%',
+    height = 'auto',
+  } = data;
   const { hideToolbar = false, overflow = false, preset = null } = data;
+  const url = {
+    desktop: desktopUrl,
+    tablet: tabletUrl || desktopUrl,
+    mobile: mobileUrl || tabletUrl || desktopUrl,
+  };
 
   useEffect(() => {
     if (props.data.queryParameters?.value) {
@@ -38,25 +70,62 @@ const View = ({ content, ...props }) => {
   }, [props.data.queryParameters, props.search])
 
   useEffect(() => {
-    try {
-      new URL(url);
-      const newUrl = getUrl(url);
-      if (props.mode === 'edit' && url !== newUrl) {
-        props.onChangeBlock(props.block, {
-          ...props.data,
-          url: newUrl,
+    if (props.data.flags?.value) {
+      try {
+        const newFlags = {};
+        const properties = JSON.parse(props.data.flags?.value).properties || {};
+        Object.keys(properties).forEach((flag) => {
+          const id = props.search[flag];
+          if (
+            id &&
+            typeof props.flags.items[properties[flag].packageName]?.[id]?.[
+              properties[flag].flag
+            ] !== 'undefined'
+          ) {
+            newFlags[properties[flag].flag] =
+              props.flags.items[properties[flag].packageName][id][
+                properties[flag].flag
+              ];
+          }
         });
+        setFlags({ ...newFlags });
+      } catch {
+        setFlags({});
       }
-    } catch {}
+    }
+  }, [props.data.flags, props.flags, props.search]);
+
+  const flagsState =
+    Object.keys(flags).filter((flag) => !flags[flag]).length > 0;
+
+  useEffect(() => {
+    if (props.mode === 'edit') {
+      props.onChangeBlock(props.block, {
+        ...props.data,
+        desktopUrl: parseUrl(desktopUrl),
+        tabletUrl: parseUrl(tabletUrl),
+        mobileUrl: parseUrl(mobileUrl),
+      });
+    }
 
     /* eslint-disable-next-line */
-  }, [url])
+  }, [desktopUrl, tabletUrl, mobileUrl])
 
   const getUrl = (url) => {
     const newUrl = new URL(url);
     return newUrl.protocol + '//' + newUrl.host + newUrl.pathname;
   };
 
+  const getUrlByWidth = () => {
+    return url[
+      Object.keys(breakPoints).filter(
+        (breakPoint) =>
+          breakPoints[breakPoint][0] >= windowWidth &&
+          breakPoints[breakPoint][1] <= windowWidth,
+      )[0]
+    ];
+  };
+
   const applyQueryParameters = (url, query) => {
     try {
       new URL(url);
@@ -71,6 +140,19 @@ const View = ({ content, ...props }) => {
     }
   };
 
+  const parseUrl = (url) => {
+    try {
+      new URL(url);
+      const newUrl = getUrl(url);
+      if (url !== newUrl) {
+        return newUrl;
+      }
+      return url;
+    } catch {
+      return '';
+    }
+  };
+
   const getPresetQueries = () => {
     if (preset === 'site_tableau') {
       return {
@@ -82,20 +164,29 @@ const View = ({ content, ...props }) => {
 
   return (
     <div>
-      <Iframe
-        title={title}
-        url={applyQueryParameters(url, {
-          ...discodataQuery,
-          ...getPresetQueries(),
-        })}
-        width={width}
-        height={height}
-        className="embeded-iframe"
-        display="initial"
-        position="relative"
-        overflow={overflow ? 'visible' : 'hidden'}
-        scrolling={false}
-      />
+      {!flagsState ? (
+        <Iframe
+          title={title}
+          url={applyQueryParameters(getUrlByWidth(), {
+            ...discodataQuery,
+            ...getPresetQueries(),
+          })}
+          width={width}
+          height={height}
+          className="embeded-iframe"
+          display="initial"
+          position="relative"
+          overflow={overflow ? 'visible' : 'hidden'}
+          scrolling={false}
+        />
+      ) : (
+        ''
+      )}
+      {props.mode === 'edit' && flagsState ? (
+        <p className="mb-0-super">Tableau edit mode</p>
+      ) : (
+        ''
+      )}
     </div>
   );
 };
@@ -104,5 +195,6 @@ export default compose(
   connect((state, props) => ({
     query: state.router.location.search,
     search: state.discodata_query.search,
+    flags: state.flags,
   })),
 )(View);
diff --git a/src/components/manage/Blocks/NavigationBlock/Edit.jsx b/src/components/manage/Blocks/NavigationBlock/Edit.jsx
index c41c3aca..270f3efe 100644
--- a/src/components/manage/Blocks/NavigationBlock/Edit.jsx
+++ b/src/components/manage/Blocks/NavigationBlock/Edit.jsx
@@ -12,15 +12,38 @@ const getSchema = (props) => {
       title: 'Parent page',
       widget: 'object_by_path',
     },
-    preset: {
-      title: 'Preset',
-      type: 'array',
-      choices: [['site', 'Site']],
-    },
     className: {
       title: 'Classname',
       type: 'text',
     },
+    pages: {
+      title: 'Specific pages',
+      type: 'schema',
+      fieldSetTitle: 'specific pages',
+      fieldSetId: 'specific-pages',
+      fieldSetSchema: {
+        fieldsets: [
+          {
+            id: 'default',
+            title: 'Default',
+            fields: ['title', 'url'],
+          },
+        ],
+        properties: {
+          title: {
+            title: 'Title',
+            type: 'text',
+          },
+          url: {
+            title: 'Url',
+            widget: 'text',
+          },
+        },
+        required: ['title', 'url'],
+      },
+      editFieldset: false,
+      deleteFieldset: false,
+    },
   };
 };
 
diff --git a/src/components/manage/Blocks/NavigationBlock/View.jsx b/src/components/manage/Blocks/NavigationBlock/View.jsx
index a9ca2089..ce75ba82 100644
--- a/src/components/manage/Blocks/NavigationBlock/View.jsx
+++ b/src/components/manage/Blocks/NavigationBlock/View.jsx
@@ -20,17 +20,27 @@ const View = ({ content, ...props }) => {
     activeItem: '',
   });
   const parent = data.parent?.value;
-  const preset = data.preset?.value;
   const history = useHistory();
-  return props.navigation?.items?.length && parent ? (
+  let pages = [];
+
+  try {
+    const pagesProperties = JSON.parse(data.pages?.value)?.properties || {};
+    Object.keys(pagesProperties).forEach((page) => {
+      pages.push(pagesProperties[page]);
+    });
+  } catch {}
+
+  const navigationItems = [...(props.navigation?.items || []), ...pages];
+
+  return (props.navigation?.items?.length && parent) || pages.length ? (
     <div className="tabs-view-menu">
       <Menu
-        widths={props.navigation.items.length}
+        widths={navigationItems.length}
         className={
           props.data.className?.value ? props.data.className.value : ''
         }
       >
-        {props.navigation.items.map((item, index) => {
+        {navigationItems.map((item, index) => {
           const url = getBasePath(item.url);
           const name = item.title;
           if (isActive(url, props.pathname) && url !== state.activeItem) {
@@ -75,9 +85,7 @@ const View = ({ content, ...props }) => {
             <Menu.Item
               className={cx(
                 index > 0 ? 'sibling-on-left' : '',
-                index < props.navigation.items.length - 1
-                  ? 'sibling-on-right'
-                  : '',
+                index < navigationItems.length - 1 ? 'sibling-on-right' : '',
               )}
               name={name}
               key={url}
diff --git a/src/components/manage/Blocks/PollutantIndex/View.jsx b/src/components/manage/Blocks/PollutantIndex/View.jsx
index 143337fb..e8addd0f 100644
--- a/src/components/manage/Blocks/PollutantIndex/View.jsx
+++ b/src/components/manage/Blocks/PollutantIndex/View.jsx
@@ -145,14 +145,10 @@ const panes = [
       if (!pollutants?.length) return '';
       return (
         <Tab.Pane>
-          {pollutant_group.name && !props.data.all_groups ? (
+          {pollutant_group.name ? (
             <div className="mb-1">
               <h3>{`Pollutant Group - ${pollutant_group.name}`}</h3>
             </div>
-          ) : props.data.all_groups ? (
-            <div className="mb-1">
-              <h3>All groups</h3>
-            </div>
           ) : (
             ''
           )}
@@ -331,8 +327,8 @@ const panes = [
         <Tab.Pane>
           <h3>Synonyms or other commercial names</h3>
           <ul className="pollutants-list">
-            {synonyms.map((synonym) => (
-              <li>{synonym}</li>
+            {synonyms.map((synonym, index) => (
+              <li key={`${index}_synonym`}>{synonym}</li>
             ))}
           </ul>
         </Tab.Pane>
@@ -600,30 +596,27 @@ const RenderTable = (props) => {
 
 const View = (props) => {
   const [activeTab, setActiveTab] = useState(0);
-  const [initialized, setInitialized] = useState({
-    groups: false,
-    pollutants: false,
-  });
+  const [initialized, setInitialized] = useState(false);
   const [currentPollutant, setCurrentPollutant] = useState(undefined);
-  const [currentPollutants, setCurrentPollutants] = useState([]);
   const [currentPollutantGroup, setCurrentPollutantGroup] = useState(undefined);
   const mounted = useRef(false);
   const indexPollutantId =
     props.discodata_query.search.index_pollutant_id || null;
   const indexPollutantGroupId =
-    props.discodata_query.search.index_pollutant_group_id?.join(',') || null;
+    props.discodata_query.search.index_pollutant_group_id || null;
   const indexPollutantGroups =
     props.discodata_resources.data.index_pollutant_groups || [];
   const indexPollutants = props.discodata_resources.data.index_pollutants || [];
   const indexPollutantIso =
     props.discodata_resources.data.index_pollutant_iso?.[indexPollutantId]
       ?.results || [];
-  const groupsIds =
-    indexPollutantGroups.map((group) => group.pollutantId) || [];
   const currentOtherProvisions =
     props.discodata_resources.data.index_pollutant_other_provisions?.[
       indexPollutantId
     ]?.results || [];
+  const currentPollutants = indexPollutants.filter(
+    (pollutant) => parseInt(pollutant.parentId) === indexPollutantGroupId,
+  );
 
   useEffect(() => {
     const newPollutant = indexPollutants.filter(
@@ -645,30 +638,40 @@ const View = (props) => {
     }
   }, [indexPollutantId]);
 
+  useEffect(() => {
+    const newPollutantGroup = indexPollutantGroups.filter(
+      (group) => parseInt(group.pollutantId) === indexPollutantGroupId,
+    )?.[0];
+
+    setCurrentPollutantGroup(
+      indexPollutantGroupId !== null && indexPollutantGroupId !== undefined
+        ? newPollutantGroup
+        : undefined,
+    );
+  }, [indexPollutantGroupId]);
+
   useEffect(() => {
     if (
       mounted.current &&
-      !initialized.groups &&
+      !initialized &&
       !indexPollutantGroupId &&
       indexPollutantGroups.length > 0 &&
       indexPollutants.length > 0
     ) {
       props.setQueryParam({
         queryParam: {
-          index_pollutant_group_id: groupsIds,
-          index_pollutant_id: indexPollutants[0].pollutantId,
+          index_pollutant_group_id: parseInt(indexPollutants[0].parentId),
+          index_pollutant_id: parseInt(indexPollutants[0].pollutantId),
         },
       });
-      const newPollutants =
-        indexPollutants?.filter(
-          (pollutant) =>
-            pollutant.pollutantId && groupsIds.includes(pollutant.parentId),
-        ) || [];
-      setCurrentPollutants(newPollutants);
-      setInitialized({
-        ...initialized,
-        groups: true,
-      });
+      setCurrentPollutantGroup(
+        indexPollutantGroups.filter(
+          (group) =>
+            parseInt(group.pollutantId) ===
+            parseInt(indexPollutants[0].parentId),
+        )[0],
+      );
+      setInitialized(true);
     }
   }, [indexPollutantGroups?.length, indexPollutants?.length]);
 
@@ -681,77 +684,39 @@ const View = (props) => {
 
   return (
     <div className="pollutant-index-container">
-      {/* <DiscodataSqlBuilder
+      <DiscodataSqlBuilder
         data={{
           '@type': 'discodata_sql_builder',
           sql: {
             value:
-              '{"fieldsets":[{"id":"sql_metadata","title":"SQL","fields":["index_pollutant_groups","index_pollutants"]}],"properties":{"index_pollutant_groups":{"title":"Index pollutant groups","isCollection":true,"hasPagination":false,"urlQuery":false,"sql":"SELECT *\\nFROM [IED].[latest].[LOV_POLLUTANT]\\nWHERE [parentId] = \'NULL\'"},"index_pollutants":{"title":"Index pollutants","isCollection":false,"hasPagination":false,"urlQuery":false,"sql":"SELECT *\\nFROM [IED].[latest].[LOV_POLLUTANT]","packageName":"index_pollutant_group_id"}},"required":[]}',
+              '{"fieldsets":[{"id":"sql_metadata","title":"SQL","fields":["index_pollutant_groups","index_pollutants","index_pollutant_iso","index_pollutant_other_provisions"]}],"properties":{"index_pollutant_groups":{"title":"Index pollutant groups","isCollection":true,"hasPagination":false,"urlQuery":false,"sql":"SELECT POL.*, POL_GROUPS.sub, POL_GROUPS.description\\nFROM [IED].[latest].[LOV_POLLUTANT] as POL\\nLEFT JOIN [IED].[latest].[pollutants_groups_details_table]  as POL_GROUPS\\nON POL.pollutantId = POL_GROUPS.pollutant_group_id \\nWHERE [parentId] = \'NULL\'\\nORDER BY name"},"index_pollutant_iso":{"title":"Index pollutants iso","hasPagination":true,"urlQuery":false,"sql":"SELECT *\\nFROM [IED].[latest].[pollutants_iso_provisions_table]","packageName":"index_pollutant_id"},"index_pollutant_other_provisions":{"title":"index_pollutant_other_provisions","hasPagination":true,"urlQuery":false,"sql":"SELECT *\\nFROM [IED].[latest].[pollutants_other_provisions_table]","packageName":"index_pollutant_id"},"index_pollutants":{"title":"Index pollutants","isCollection":true,"hasPagination":false,"urlQuery":false,"sql":"SELECT POL.code,\\nPOL.name,\\nPOL.startYear,\\nPOL.endYear,\\nPOL.parentId,\\nPOL.cas,\\nPOL.eperPollutantId,\\nPOL.codeEPER,\\nPOL_DET.*\\nFROM [IED].[latest].[LOV_POLLUTANT] as POL\\nLEFT JOIN [IED].[latest].[pollutants_details_table] AS POL_DET\\nON POL.pollutantId = POL_DET.pollutantId\\nORDER BY name","packageName":"index_pollutant_group_id"}},"required":[]}',
           },
           where: {
             value:
-              '{"fieldsets":[{"id":"where_statements_metadata","title":"Where statements","fields":["w1"]}],"properties":{"w1":{"title":"W1","sqlId":"index_pollutants","urlQuery":false,"key":"parentId","queryParam":"index_pollutant_group_id"}},"required":[]}',
+              '{"fieldsets":[{"id":"where_statements_metadata","title":"Where statements","fields":["w1","w2"]}],"properties":{"w1":{"title":"W1","sqlId":"index_pollutant_iso","urlQuery":false,"key":"pollutantId","queryParam":"index_pollutant_id"},"w2":{"title":"W2","sqlId":"index_pollutant_other_provisions","urlQuery":false,"key":"other_provision_id","queryParam":"index_pollutant_other_provisions","isExact":true}},"required":[]}',
           },
         }}
-      /> */}
+      />
       <div className="custom-selector big blue display-flex flex-flow-column">
         <Dropdown
+          search
           selection
           onChange={(event, data) => {
-            const groupId = data.options
-              .filter((opt) => {
-                return opt.value === data.value;
-              })[0]
-              ?.value?.split(',');
-
-            const newPollutants =
-              indexPollutants?.filter(
-                (pollutant) =>
-                  pollutant.pollutantId && groupId.includes(pollutant.parentId),
-              ) || [];
-            setCurrentPollutantGroup(
-              indexPollutantGroups.filter(
-                (pollutant) => pollutant.pollutantId === groupId.join(','),
-              )?.[0],
-            );
-            setCurrentPollutants(newPollutants);
-            props.setQueryParam({
-              queryParam: {
-                index_pollutant_group_id: groupId,
-                index_pollutant_id: newPollutants?.[0]?.pollutantId,
-              },
-            });
-          }}
-          placeholder={'Pollutant Group'}
-          options={[
-            {
-              key: 'all_groups',
-              value: groupsIds.join(','),
-              text: 'All groups',
-            },
-            ...indexPollutantGroups
-              .filter((pollutantGroup) => pollutantGroup.pollutantId)
-              .map((pollutantGroup) => ({
-                key: pollutantGroup.code,
-                value: pollutantGroup.pollutantId,
-                text: pollutantGroup.name,
-              })),
-          ]}
-          value={indexPollutantGroupId}
-        />
-        <Dropdown
-          selection
-          onChange={(event, data) => {
+            const pollutantId = data.options.filter((opt) => {
+              return opt.value === data.value;
+            })[0]?.value;
+            const newPollutant = indexPollutants.filter(
+              (pollutant) => pollutant.pollutantId === pollutantId,
+            )?.[0];
             props.setQueryParam({
               queryParam: {
-                index_pollutant_id: data.options.filter((opt) => {
-                  return opt.value === data.value;
-                })[0]?.value,
+                index_pollutant_group_id: parseInt(newPollutant.parentId),
+                index_pollutant_id: parseInt(pollutantId),
               },
             });
           }}
           placeholder={'Pollutant'}
-          options={currentPollutants
+          options={indexPollutants
             .filter((pollutant) => pollutant.pollutantId)
             .map((pollutant) => ({
               key: pollutant.code,
@@ -769,7 +734,6 @@ const View = (props) => {
         }}
         data={{
           pollutants: currentPollutants,
-          all_groups: groupsIds.join(',') === indexPollutantGroupId,
           pollutant: currentPollutant,
           pollutant_iso: indexPollutantIso,
           pollutant_group: currentPollutantGroup,
diff --git a/src/components/manage/Blocks/PollutantIndex/style.css b/src/components/manage/Blocks/PollutantIndex/style.css
index 07215927..9b3d9646 100644
--- a/src/components/manage/Blocks/PollutantIndex/style.css
+++ b/src/components/manage/Blocks/PollutantIndex/style.css
@@ -82,4 +82,17 @@
 
 .pollutant-index-container .pollutants-list li {
   margin-bottom: 0.5em;
+}
+
+.pollutant-index-container .ui.search.dropdown input {
+  color: #4296B3;
+  font-weight: bold !important;
+  font-size: 30px !important;
+  line-height: 39px !important;
+  padding: 0 !important;
+  padding-right: 60px !important;
+}
+
+.pollutant-index-container .ui.search.dropdown.active .text {
+  min-width: 120px !important;
 }
\ No newline at end of file
diff --git a/src/localconfig.js b/src/localconfig.js
index e2f058a4..f60397f4 100644
--- a/src/localconfig.js
+++ b/src/localconfig.js
@@ -46,6 +46,9 @@ import FlagsView from '~/components/manage/Blocks/Flags/View';
 import PollutantIndexEdit from '~/components/manage/Blocks/PollutantIndex/Edit';
 import PollutantIndexView from '~/components/manage/Blocks/PollutantIndex/View';
 
+import GlossarySearchBlockEdit from '~/components/manage/Blocks/GlossarySearchBlock/Edit';
+import GlossarySearchBlockView from '~/components/manage/Blocks/GlossarySearchBlock/View';
+
 import DummyBlockEdit from '~/components/manage/Blocks/DummyBlock/Edit';
 import DummyBlockView from '~/components/manage/Blocks/DummyBlock/View';
 
@@ -231,6 +234,15 @@ export function applyConfig(voltoConfig) {
     icon: packSVG,
   };
 
+  config.blocks.blocksConfig.eprtr_glossary_search_block = {
+    id: 'eprtr_glossary_search_block',
+    title: 'Eprtr glossary search block',
+    group: 'eprtr_blocks',
+    view: GlossarySearchBlockView,
+    edit: GlossarySearchBlockEdit,
+    icon: packSVG,
+  };
+
   config.blocks.blocksConfig.eprtr_dummy_block = {
     id: 'eprtr_dummy_block',
     title: 'Eprtr dummy block',
diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides
index dd67a80e..c387bc24 100644
--- a/theme/site/globals/site.overrides
+++ b/theme/site/globals/site.overrides
@@ -1257,11 +1257,12 @@ body.has-sidebar {
             font-weight: bold !important;
             color: #D63D27 !important;
             background-color: transparent !important;
-            padding: 10px 40px !important;
+            padding: 10px 30px !important;
             border-radius: 22px;
             border: 1px solid #D63D27;
             margin-right: 0 !important;
             margin-left: 0 !important;
+            flex: 1;
             &:before {
               width: 0;
               background-color: transparent !important;