diff --git a/docs/database/columns.html b/docs/database/columns.html
index 5804ca23..27a53b7b 100644
--- a/docs/database/columns.html
+++ b/docs/database/columns.html
@@ -105,11 +105,37 @@ <h3 class="box-title">Columns</h3>
                 <script>
                     var tableData = [
     {
-        "tableName": "v_dataset",
+        "tableName": "contact",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "email",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Email address<\/p>"
+    },
+    {
+        "tableName": "glossary",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "description_de",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "v_orphan_tables",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "abstract",
+        "name": "schemaname",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -118,43 +144,82 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_link",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "geometry_type",
+        "name": "table_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Geometry type. E.g. Polygon<\/p>"
+        "comments": ""
     },
     {
         "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "indexedColumn",
         "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>table_name",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>uid",
+        "type": "uuid",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "uuid_generate_v4()",
+        "comments": "<p>Unique identifier of the data. E.g. 89e3dde9-3850-c211-5045-b5b09aa1da9a<\/p>"
+    },
+    {
+        "tableName": "v_dataset",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "abstract",
         "type": "text",
         "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "v_link",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "schema_name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "qgis_plugin",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "status",
+        "type": "int2",
+        "length": 5,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Name of the related table in the database<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "link",
+        "tableName": "glossary",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "serial",
-        "length": 10,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "label_en",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.link_id_seq'::regclass)",
-        "comments": "<p>Internal automatic integer ID<\/p>"
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Item label<\/p>"
     },
     {
         "tableName": "dataset_contact",
@@ -170,33 +235,33 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>Role of the contact for the specified dataset item. E.g. owner, distributor<\/p>"
     },
     {
-        "tableName": "dataset",
+        "tableName": "contact",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "license",
+        "name": "organisation_name",
         "type": "text",
         "length": 2147483647,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>License. E.g. Public domain<\/p>"
+        "comments": "<p>Organisation name. E.g. ACME<\/p>"
     },
     {
-        "tableName": "link",
-        "tableType": "Table",
+        "tableName": "v_valid_dataset",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "type",
+        "name": "schema_name",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Type of the link. E.g. https, git, OGC:WFS<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_table_comment_from_metadata",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
@@ -209,37 +274,63 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "qgis_plugin",
+        "tableName": "theme",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('pgmetadata.theme_id_seq'::regclass)",
+        "comments": "<p>Internal automatic integer ID<\/p>"
+    },
+    {
+        "tableName": "html_template",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "status",
-        "type": "int2",
-        "length": 5,
-        "nullable": "",
+        "name": "content",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_schema_list",
-        "tableType": "View",
+        "tableName": "dataset_contact",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('pgmetadata.dataset_contact_id_seq'::regclass)",
+        "comments": "<p>Internal automatic integer ID<\/p>"
+    },
+    {
+        "tableName": "dataset",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "int8",
-        "length": 19,
+        "name": "geometry_type",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Geometry type. E.g. Polygon<\/p>"
     },
     {
-        "tableName": "v_link",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_name",
+        "name": "categories",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -248,24 +339,37 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "html_template",
+        "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "content",
-        "type": "text",
-        "length": 2147483647,
+        "name": "minimum_optimal_scale",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Minimum optimal scale denominator to view the data. E.g. 100000 for 1/100000. Most &ldquo;zoomed out&rdquo;.<\/p>"
     },
     {
-        "tableName": "glossary",
+        "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "label_fr",
+        "name": "creation_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": "<p>Date of creation of the dataset item<\/p>"
+    },
+    {
+        "tableName": "v_dataset",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "minimum_optimal_scale",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -278,85 +382,111 @@ <h3 class="box-title">Columns</h3>
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confidentiality",
-        "type": "text",
-        "length": 2147483647,
+        "name": "feature_count",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_contact",
-        "tableType": "View",
+        "tableName": "link",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
+        "name": "description",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Description<\/p>"
     },
     {
-        "tableName": "glossary",
+        "tableName": "dataset",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "title",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Title of the data<\/p>"
+    },
+    {
+        "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "indexedColumn",
         "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>field",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>table_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Field name<\/p>"
+        "comments": "<p>Name of the related table in the database<\/p>"
     },
     {
-        "tableName": "contact",
+        "tableName": "glossary",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
+        "name": "label_es",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Full name of the contact<\/p>"
+        "comments": ""
     },
     {
         "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "projection_name",
+        "name": "license",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Projection name of the dataset. E.g. WGS 84 - Geographic<\/p>"
+        "comments": "<p>License. E.g. Public domain<\/p>"
     },
     {
-        "tableName": "v_link",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
+        "name": "creation_date",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_valid_dataset",
+        "tableName": "link",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "url",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Full URL<\/p>"
+    },
+    {
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schema_name",
+        "name": "themes",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -369,20 +499,20 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "themes",
-        "type": "_text",
+        "name": "spatial_extent",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>List of themes<\/p>"
+        "comments": "<p>Spatial extent of the data. xmin,ymin,xmax,ymax.<\/p>"
     },
     {
         "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "geometry_type",
+        "name": "title",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -390,12 +520,38 @@ <h3 class="box-title">Columns</h3>
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "dataset",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "themes",
+        "type": "_text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>List of themes<\/p>"
+    },
+    {
+        "tableName": "theme",
+        "tableType": "Table",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>code",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Code Of the theme<\/p>"
+    },
     {
         "tableName": "v_link",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "url",
+        "name": "mime",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -404,39 +560,39 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "dataset",
+        "tableName": "link",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "title",
+        "name": "name",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Title of the data<\/p>"
+        "comments": "<p>Name of the link<\/p>"
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_dataset",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "publication_frequency",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": "<p>Date of update of the dataset item<\/p>"
+        "defaultValue": "null",
+        "comments": ""
     },
     {
-        "tableName": "v_orphan_tables",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "int8",
-        "length": 19,
+        "name": "update_date",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -447,33 +603,33 @@ <h3 class="box-title">Columns</h3>
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "size",
-        "type": "int4",
-        "length": 10,
+        "name": "mime_label",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_dataset",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "feature_count",
-        "type": "int4",
-        "length": 10,
+        "name": "uid",
+        "type": "uuid",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Number of features of the data<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_contact",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "keywords",
+        "name": "name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -482,12 +638,12 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_glossary",
+        "tableName": "v_contact",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "dict",
-        "type": "json",
+        "name": "contact_role",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -495,11 +651,24 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_dataset",
-        "tableType": "View",
+        "tableName": "glossary",
+        "tableType": "Table",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>code",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Item code<\/p>"
+    },
+    {
+        "tableName": "glossary",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "license",
+        "name": "label_it",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -508,51 +677,51 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_locales",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "categories",
-        "type": "_text",
+        "name": "locale",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>List of categories<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_dataset_as_dcat",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "data_last_update",
-        "type": "timestamp",
-        "length": 29,
+        "name": "uid",
+        "type": "uuid",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Date of the last modification of the target data (not on the dataset item line)<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "link",
+        "tableName": "contact",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
+        "name": "organisation_unit",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Name of the link<\/p>"
+        "comments": "<p>Organisation unit name. E.g. GIS unit<\/p>"
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_dataset_as_dcat",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "publication_frequency",
-        "type": "text",
+        "name": "dataset",
+        "type": "xml",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -560,64 +729,38 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "qgis_plugin",
+        "tableName": "contact",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "version_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "html_template",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>section",
+        "name": "name",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Full name of the contact<\/p>"
     },
     {
         "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "minimum_optimal_scale",
-        "type": "text",
-        "length": 2147483647,
+        "name": "data_last_update",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>uid",
-        "type": "uuid",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "uuid_generate_v4()",
-        "comments": "<p>Unique identifier of the data. E.g. 89e3dde9-3850-c211-5045-b5b09aa1da9a<\/p>"
-    },
-    {
-        "tableName": "v_dataset",
+        "tableName": "v_glossary",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "maximum_optimal_scale",
-        "type": "text",
+        "name": "dict",
+        "type": "json",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -629,33 +772,33 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "spatial_extent",
-        "type": "text",
-        "length": 2147483647,
+        "name": "data_last_update",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Spatial extent of the data. xmin,ymin,xmax,ymax.<\/p>"
+        "comments": "<p>Date of the last modification of the target data (not on the dataset item line)<\/p>"
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_schema_list",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "spatial_level",
-        "type": "text",
-        "length": 2147483647,
+        "name": "id",
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_contact",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "organisation_unit",
+        "name": "geometry_type",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -664,37 +807,50 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "glossary",
+        "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description_fr",
+        "name": "feature_count",
+        "type": "int4",
+        "length": 10,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Number of features of the data<\/p>"
+    },
+    {
+        "tableName": "theme",
+        "tableType": "Table",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>label",
         "type": "text",
         "length": 2147483647,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Label of the theme<\/p>"
     },
     {
-        "tableName": "v_table_list",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_name",
-        "type": "text",
-        "length": 2147483647,
+        "name": "publication_date",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_link",
+        "tableName": "v_schema_list",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "type_label",
+        "name": "schema_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -703,37 +859,24 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "dataset_contact",
+        "tableName": "glossary",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>fk_id_contact",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Id of the contact item<\/p>"
-    },
-    {
-        "tableName": "v_dataset",
-        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "publication_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "description_es",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_link",
+        "tableName": "v_contact",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "type",
+        "name": "organisation_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -746,59 +889,72 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "creation_date",
+        "name": "publication_date",
         "type": "timestamp",
         "length": 29,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "now()",
-        "comments": "<p>Date of creation of the dataset item<\/p>"
+        "comments": "<p>Date of publication of the data<\/p>"
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_contact",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "creation_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "table_name",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "dataset_contact",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>fk_id_dataset",
+        "tableName": "v_link",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "size",
         "type": "int4",
         "length": 10,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Id of the dataset item<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "link",
+        "tableName": "v_contact",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "contact_role_code",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "glossary",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "format",
+        "name": "label_fr",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Format.<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "v_dataset",
-        "tableType": "View",
+        "tableName": "glossary",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "spatial_extent",
+        "name": "description_fr",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -807,13 +963,13 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_orphan_dataset_items",
+        "tableName": "v_valid_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "int8",
-        "length": 19,
+        "name": "table_name",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -824,33 +980,33 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "item_order",
-        "type": "int2",
-        "length": 5,
+        "name": "label_de",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Display order<\/p>"
+        "comments": ""
     },
     {
         "tableName": "link",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "mime",
-        "type": "text",
-        "length": 2147483647,
+        "name": "size",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Mime type<\/p>"
+        "comments": "<p>Size of the target<\/p>"
     },
     {
-        "tableName": "v_link",
-        "tableType": "View",
+        "tableName": "glossary",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "description_it",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -859,24 +1015,24 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_contact",
-        "tableType": "View",
+        "tableName": "theme",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_name",
+        "name": "description",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Description of the theme<\/p>"
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_orphan_dataset_items",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schema_name",
+        "name": "table_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -885,72 +1041,46 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "html_template",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.html_template_id_seq'::regclass)",
-        "comments": ""
-    },
-    {
-        "tableName": "contact",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.contact_id_seq'::regclass)",
-        "comments": "<p>Internal automatic integer ID<\/p>"
-    },
-    {
-        "tableName": "glossary",
+        "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "label",
+        "name": "projection_authid",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Item label<\/p>"
+        "comments": "<p>Projection auth id. E.g. EPSG:4326<\/p>"
     },
     {
-        "tableName": "theme",
+        "tableName": "dataset",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>schema_name",
         "type": "text",
         "length": 2147483647,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Description of the theme<\/p>"
+        "comments": "<p>Name of the related schema in the database<\/p>"
     },
     {
-        "tableName": "v_dataset",
-        "tableType": "View",
+        "tableName": "glossary",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "uid",
-        "type": "uuid",
-        "length": 2147483647,
+        "name": "item_order",
+        "type": "int2",
+        "length": 5,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Display order<\/p>"
     },
     {
-        "tableName": "v_orphan_dataset_items",
+        "tableName": "v_contact",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
@@ -963,43 +1093,30 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_dataset",
-        "tableType": "View",
+        "tableName": "dataset",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "themes",
+        "name": "publication_frequency",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Frequency of publication: how often the data is published.<\/p>"
     },
     {
-        "tableName": "v_dataset",
-        "tableType": "View",
+        "tableName": "link",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "qgis_plugin",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>id",
-        "type": "int4",
-        "length": 10,
+        "name": "type",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Type of the link. E.g. https, git, OGC:WFS<\/p>"
     },
     {
         "tableName": "link",
@@ -1015,33 +1132,33 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>Id of the dataset item<\/p>"
     },
     {
-        "tableName": "v_table_comment_from_metadata",
+        "tableName": "v_link",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_name",
-        "type": "text",
-        "length": 2147483647,
+        "name": "id",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_orphan_dataset_items",
-        "tableType": "View",
+        "tableName": "dataset",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_name",
-        "type": "text",
-        "length": 2147483647,
+        "name": "update_date",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
+        "defaultValue": "now()",
+        "comments": "<p>Date of update of the dataset item<\/p>"
     },
     {
-        "tableName": "dataset",
+        "tableName": "glossary",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
@@ -1050,7 +1167,7 @@ <h3 class="box-title">Columns</h3>
         "length": 10,
         "nullable": "",
         "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.dataset_id_seq'::regclass)",
+        "defaultValue": "nextval('pgmetadata.glossary_id_seq'::regclass)",
         "comments": "<p>Internal automatic integer ID<\/p>"
     },
     {
@@ -1058,20 +1175,33 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "keywords",
+        "name": "abstract",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Full description of the data<\/p>"
+    },
+    {
+        "tableName": "glossary",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "description_en",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>List of keywords separated by comma. Ex: environment, paris, trees<\/p>"
+        "comments": "<p>Description<\/p>"
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_link",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "projection_name",
+        "name": "type",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1084,59 +1214,59 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "maximum_optimal_scale",
-        "type": "int4",
-        "length": 10,
+        "name": "confidentiality",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Maximum optimal scale denominator to view the data. E.g. 2000 for 1/2000. Most &ldquo;zoomed in&rdquo;.<\/p>"
+        "comments": "<p>Confidentiality of the data.<\/p>"
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_dataset",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confidentiality",
+        "name": "maximum_optimal_scale",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Confidentiality of the data.<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>schema_name",
+        "tableName": "v_dataset",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "spatial_level",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Name of the related schema in the database<\/p>"
+        "comments": ""
     },
     {
         "tableName": "dataset",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "publication_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "projection_name",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": "<p>Date of publication of the data<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>Projection name of the dataset. E.g. WGS 84 - Geographic<\/p>"
     },
     {
-        "tableName": "v_table_comment_from_metadata",
+        "tableName": "v_link",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_comment",
+        "name": "name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1145,50 +1275,63 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_dataset",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "minimum_optimal_scale",
-        "type": "int4",
-        "length": 10,
+        "name": "license",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Minimum optimal scale denominator to view the data. E.g. 100000 for 1/100000. Most &ldquo;zoomed out&rdquo;.<\/p>"
+        "comments": ""
     },
     {
         "tableName": "link",
         "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('pgmetadata.link_id_seq'::regclass)",
+        "comments": "<p>Internal automatic integer ID<\/p>"
+    },
+    {
+        "tableName": "v_link",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "size",
-        "type": "int4",
-        "length": 10,
+        "name": "format",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Size of the target<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "dataset",
+        "tableName": "link",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "geom",
-        "type": "geometry",
+        "name": "mime",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Geometry defining the extent of the data. Can be any polygon.<\/p>"
+        "comments": "<p>Mime type<\/p>"
     },
     {
-        "tableName": "v_contact",
+        "tableName": "v_dataset_as_dcat",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schema_name",
+        "name": "table_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1197,24 +1340,24 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "theme",
+        "tableName": "dataset_contact",
         "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>label",
-        "type": "text",
-        "length": 2147483647,
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>fk_id_dataset",
+        "type": "int4",
+        "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Label of the theme<\/p>"
+        "comments": "<p>Id of the dataset item<\/p>"
     },
     {
-        "tableName": "v_contact",
+        "tableName": "v_dataset_as_dcat",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "contact_role",
+        "name": "schema_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1223,11 +1366,11 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_schema_list",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schema_name",
+        "name": "table_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1240,20 +1383,20 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "projection_authid",
-        "type": "text",
-        "length": 2147483647,
+        "name": "maximum_optimal_scale",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Projection auth id. E.g. EPSG:4326<\/p>"
+        "comments": "<p>Maximum optimal scale denominator to view the data. E.g. 2000 for 1/2000. Most &ldquo;zoomed in&rdquo;.<\/p>"
     },
     {
-        "tableName": "v_contact",
+        "tableName": "v_orphan_dataset_items",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email",
+        "name": "schema_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1262,46 +1405,46 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "contact",
-        "tableType": "Table",
+        "tableName": "v_table_comment_from_metadata",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "organisation_unit",
+        "name": "table_schema",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Organisation unit name. E.g. GIS unit<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "v_link",
+        "tableName": "v_table_list",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
         "name": "id",
-        "type": "int4",
-        "length": 10,
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "contact",
-        "tableType": "Table",
+        "tableName": "v_contact",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "organisation_name",
+        "name": "email",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Organisation name. E.g. ACME<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "dataset_contact",
+        "tableName": "html_template",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
@@ -1310,141 +1453,154 @@ <h3 class="box-title">Columns</h3>
         "length": 10,
         "nullable": "",
         "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.dataset_contact_id_seq'::regclass)",
-        "comments": "<p>Internal automatic integer ID<\/p>"
+        "defaultValue": "nextval('pgmetadata.html_template_id_seq'::regclass)",
+        "comments": ""
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_orphan_dataset_items",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "title",
-        "type": "text",
-        "length": 2147483647,
+        "name": "id",
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_table_list",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schema_name",
-        "type": "text",
-        "length": 2147483647,
+        "name": "id",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_dataset",
+        "tableName": "v_orphan_tables",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "categories",
-        "type": "text",
-        "length": 2147483647,
+        "name": "id",
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_table_comment_from_metadata",
-        "tableType": "View",
+        "tableName": "dataset",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_schema",
-        "type": "text",
+        "name": "geom",
+        "type": "geometry",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Geometry defining the extent of the data. Can be any polygon.<\/p>"
+    },
+    {
+        "tableName": "dataset_contact",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>fk_id_contact",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Id of the contact item<\/p>"
     },
     {
         "tableName": "v_table_list",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "int8",
-        "length": 19,
+        "name": "schema_name",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_dataset",
-        "tableType": "View",
+        "tableName": "dataset",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('pgmetadata.dataset_id_seq'::regclass)",
+        "comments": "<p>Internal automatic integer ID<\/p>"
+    },
+    {
+        "tableName": "dataset",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "categories",
+        "type": "_text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>List of categories<\/p>"
     },
     {
-        "tableName": "theme",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>code",
+        "tableName": "v_dataset",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "confidentiality",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Code Of the theme<\/p>"
+        "comments": ""
     },
     {
         "tableName": "qgis_plugin",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "version",
-        "type": "text",
-        "length": 2147483647,
+        "name": "version_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "glossary",
+        "tableName": "html_template",
         "tableType": "Table",
         "keyClass": "indexedColumn",
         "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>code",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Item code<\/p>"
-    },
-    {
-        "tableName": "link",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "url",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>section",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Full URL<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "glossary",
+        "tableName": "contact",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
@@ -1453,7 +1609,7 @@ <h3 class="box-title">Columns</h3>
         "length": 10,
         "nullable": "",
         "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.glossary_id_seq'::regclass)",
+        "defaultValue": "nextval('pgmetadata.contact_id_seq'::regclass)",
         "comments": "<p>Internal automatic integer ID<\/p>"
     },
     {
@@ -1461,20 +1617,20 @@ <h3 class="box-title">Columns</h3>
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "feature_count",
-        "type": "int4",
-        "length": 10,
+        "name": "spatial_extent",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_link",
+        "tableName": "v_table_comment_from_metadata",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schema_name",
+        "name": "table_comment",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1483,37 +1639,37 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "link",
-        "tableType": "Table",
+        "tableName": "v_link",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "url",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Description<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "v_link",
-        "tableType": "View",
+        "tableName": "qgis_plugin",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "mime_label",
+        "name": "version",
         "type": "text",
         "length": 2147483647,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "v_orphan_tables",
+        "tableName": "v_link",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "schemaname",
+        "name": "description",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1522,16 +1678,29 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_link",
-        "tableType": "View",
+        "tableName": "dataset",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "mime",
+        "name": "spatial_level",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
+        "comments": "<p>Spatial level of the data. E.g. city, country, street<\/p>"
+    },
+    {
+        "tableName": "qgis_plugin",
+        "tableType": "Table",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>id",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
         "comments": ""
     },
     {
@@ -1539,20 +1708,20 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "abstract",
+        "name": "keywords",
         "type": "text",
         "length": 2147483647,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Full description of the data<\/p>"
+        "comments": "<p>List of keywords separated by comma. Ex: environment, paris, trees<\/p>"
     },
     {
-        "tableName": "v_contact",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "organisation_name",
+        "name": "projection_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1561,24 +1730,24 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_link",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "spatial_level",
+        "name": "type_label",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Spatial level of the data. E.g. city, country, street<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "v_orphan_tables",
+        "tableName": "v_dataset",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "tablename",
+        "name": "schema_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1600,11 +1769,11 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_valid_dataset",
+        "tableName": "v_contact",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "table_name",
+        "name": "organisation_unit",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1613,8 +1782,8 @@ <h3 class="box-title">Columns</h3>
         "comments": ""
     },
     {
-        "tableName": "v_link",
-        "tableType": "View",
+        "tableName": "link",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
         "name": "format",
@@ -1623,59 +1792,59 @@ <h3 class="box-title">Columns</h3>
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "theme",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('pgmetadata.theme_id_seq'::regclass)",
-        "comments": "<p>Internal automatic integer ID<\/p>"
+        "comments": "<p>Format.<\/p>"
     },
     {
-        "tableName": "glossary",
-        "tableType": "Table",
+        "tableName": "v_dataset",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "keywords",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Description<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "dataset",
-        "tableType": "Table",
+        "tableName": "v_table_list",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "publication_frequency",
+        "name": "table_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Frequency of publication: how often the data is published.<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "contact",
-        "tableType": "Table",
+        "tableName": "v_orphan_tables",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email",
+        "name": "tablename",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Email address<\/p>"
+        "comments": ""
+    },
+    {
+        "tableName": "glossary",
+        "tableType": "Table",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>field",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Field name<\/p>"
     }
 ];
                     var config = {
diff --git a/docs/database/diagrams/orphans/glossary.1degree.dot b/docs/database/diagrams/orphans/glossary.1degree.dot
index 438b31d6..76865d19 100644
--- a/docs/database/diagrams/orphans/glossary.1degree.dot
+++ b/docs/database/diagrams/orphans/glossary.1degree.dot
@@ -20,14 +20,20 @@ digraph "glossary" {
    label=<
     <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>glossary</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="field" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">field</TD></TR></TABLE></TD><TD PORT="field.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="code" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">code</TD></TR></TABLE></TD><TD PORT="code.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="label" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">label</TD></TR></TABLE></TD><TD PORT="label.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="item_order" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">item_order</TD></TR></TABLE></TD><TD PORT="item_order.type" ALIGN="LEFT">int2[5]</TD></TR>
-      <TR><TD PORT="label_fr" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">label_fr</TD></TR></TABLE></TD><TD PORT="label_fr.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="description_fr" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="82" HEIGHT="16">description_fr</TD></TR></TABLE></TD><TD PORT="description_fr.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">serial[10]</TD></TR>
+      <TR><TD PORT="field" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">field</TD></TR></TABLE></TD><TD PORT="field.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="code" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">code</TD></TR></TABLE></TD><TD PORT="code.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="label_en" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">label_en</TD></TR></TABLE></TD><TD PORT="label_en.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="description_en" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">description_en</TD></TR></TABLE></TD><TD PORT="description_en.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="item_order" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">item_order</TD></TR></TABLE></TD><TD PORT="item_order.type" ALIGN="LEFT">int2[5]</TD></TR>
+      <TR><TD PORT="label_fr" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">label_fr</TD></TR></TABLE></TD><TD PORT="label_fr.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="description_fr" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">description_fr</TD></TR></TABLE></TD><TD PORT="description_fr.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="label_it" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">label_it</TD></TR></TABLE></TD><TD PORT="label_it.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="description_it" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">description_it</TD></TR></TABLE></TD><TD PORT="description_it.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="label_es" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">label_es</TD></TR></TABLE></TD><TD PORT="label_es.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="description_es" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">description_es</TD></TR></TABLE></TD><TD PORT="description_es.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="label_de" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">label_de</TD></TR></TABLE></TD><TD PORT="label_de.type" ALIGN="LEFT">text[2147483647]</TD></TR>
+      <TR><TD PORT="description_de" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="87" HEIGHT="16">description_de</TD></TR></TABLE></TD><TD PORT="description_de.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">129 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="tables/glossary.html"
diff --git a/docs/database/diagrams/orphans/glossary.1degree.png b/docs/database/diagrams/orphans/glossary.1degree.png
index bc6db0fc..8b55d423 100644
Binary files a/docs/database/diagrams/orphans/glossary.1degree.png and b/docs/database/diagrams/orphans/glossary.1degree.png differ
diff --git a/docs/database/gis.pgmetadata.xml b/docs/database/gis.pgmetadata.xml
index 8996a0b7..63c78762 100644
--- a/docs/database/gis.pgmetadata.xml
+++ b/docs/database/gis.pgmetadata.xml
@@ -90,11 +90,17 @@
          <column autoUpdated="true" defaultValue="nextval('pgmetadata.glossary_id_seq'::regclass)" digits="0" id="0" name="id" nullable="false" remarks="Internal automatic integer ID" size="10" type="serial" typeCode="4"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="field" nullable="false" remarks="Field name" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="code" nullable="false" remarks="Item code" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="label" nullable="false" remarks="Item label" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="description" nullable="true" remarks="Description" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="label_en" nullable="false" remarks="Item label" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="description_en" nullable="true" remarks="Description" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="item_order" nullable="true" remarks="Display order" size="5" type="int2" typeCode="5"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="label_fr" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="description_fr" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="label_it" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="description_it" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="10" name="label_es" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="11" name="description_es" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="12" name="label_de" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="13" name="description_de" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <primaryKey column="id" sequenceNumberInPK="1"/>
          <index name="glossary_pkey" unique="true">
             <column ascending="true" name="id"/>
@@ -162,16 +168,17 @@
             <column ascending="true" name="label"/>
          </index>
       </table>
-      <table name="v_contact" numRows="0" remarks="Formatted version of contact data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content. The localized version of labels and descriptions are taken considering the session setting 'pgmetadata.locale'. For example with: SET SESSION &quot;pgmetadata.locale&quot; = 'fr';" schema="pgmetadata" type="VIEW" viewSql=" WITH glossary AS (&#10;         SELECT COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT d.table_name,&#10;    d.schema_name,&#10;    c.name,&#10;    c.organisation_name,&#10;    c.organisation_unit,&#10;    ((((glossary.dict -&gt; 'contact.contact_role'::text) -&gt; dc.contact_role) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS contact_role,&#10;    c.email&#10;   FROM glossary,&#10;    ((pgmetadata.dataset_contact dc&#10;     JOIN pgmetadata.dataset d ON ((d.id = dc.fk_id_dataset)))&#10;     JOIN pgmetadata.contact c ON ((dc.fk_id_contact = c.id)))&#10;  WHERE true&#10;  ORDER BY dc.id;">
+      <table name="v_contact" numRows="0" remarks="Formatted version of contact data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content. The localized version of labels and descriptions are taken considering the session setting 'pgmetadata.locale'. For example with: SET SESSION &quot;pgmetadata.locale&quot; = 'fr';" schema="pgmetadata" type="VIEW" viewSql=" WITH glossary AS (&#10;         SELECT COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT d.table_name,&#10;    d.schema_name,&#10;    c.name,&#10;    c.organisation_name,&#10;    c.organisation_unit,&#10;    ((((glossary.dict -&gt; 'contact.contact_role'::text) -&gt; dc.contact_role) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS contact_role,&#10;    dc.contact_role AS contact_role_code,&#10;    c.email&#10;   FROM glossary,&#10;    ((pgmetadata.dataset_contact dc&#10;     JOIN pgmetadata.dataset d ON ((d.id = dc.fk_id_dataset)))&#10;     JOIN pgmetadata.contact c ON ((dc.fk_id_contact = c.id)))&#10;  WHERE true&#10;  ORDER BY dc.id;">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="table_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="schema_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="organisation_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="organisation_unit" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="contact_role" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="email" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="contact_role_code" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="email" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
       </table>
-      <table name="v_dataset" numRows="0" remarks="Formatted version of dataset data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content." schema="pgmetadata" type="VIEW" viewSql=" WITH glossary AS (&#10;         SELECT COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        ), s AS (&#10;         SELECT d.id,&#10;            d.uid,&#10;            d.table_name,&#10;            d.schema_name,&#10;            d.title,&#10;            d.abstract,&#10;            d.categories,&#10;            d.themes,&#10;            d.keywords,&#10;            d.spatial_level,&#10;            d.minimum_optimal_scale,&#10;            d.maximum_optimal_scale,&#10;            d.publication_date,&#10;            d.publication_frequency,&#10;            d.license,&#10;            d.confidentiality,&#10;            d.feature_count,&#10;            d.geometry_type,&#10;            d.projection_name,&#10;            d.projection_authid,&#10;            d.spatial_extent,&#10;            d.creation_date,&#10;            d.update_date,&#10;            d.geom,&#10;            cat.cat,&#10;            theme.theme&#10;           FROM ((pgmetadata.dataset d&#10;             LEFT JOIN LATERAL unnest(d.categories) cat(cat) ON (true))&#10;             LEFT JOIN LATERAL unnest(d.themes) theme(theme) ON (true))&#10;          WHERE true&#10;          ORDER BY d.id&#10;        ), ss AS (&#10;         SELECT s.id,&#10;            s.uid,&#10;            s.table_name,&#10;            s.schema_name,&#10;            s.title,&#10;            s.abstract,&#10;            ((((glossary.dict -&gt; 'dataset.categories'::text) -&gt; s.cat) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS cat,&#10;            gtheme.label AS theme,&#10;            s.keywords,&#10;            s.spatial_level,&#10;            ('1/'::text || s.minimum_optimal_scale) AS minimum_optimal_scale,&#10;            ('1/'::text || s.maximum_optimal_scale) AS maximum_optimal_scale,&#10;            s.publication_date,&#10;            ((((glossary.dict -&gt; 'dataset.publication_frequency'::text) -&gt; s.publication_frequency) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS publication_frequency,&#10;            ((((glossary.dict -&gt; 'dataset.license'::text) -&gt; s.license) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS license,&#10;            ((((glossary.dict -&gt; 'dataset.confidentiality'::text) -&gt; s.confidentiality) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS confidentiality,&#10;            s.feature_count,&#10;            s.geometry_type,&#10;            (regexp_split_to_array((rs.srtext)::text, '&quot;'::text))[2] AS projection_name,&#10;            s.projection_authid,&#10;            s.spatial_extent,&#10;            s.creation_date,&#10;            s.update_date&#10;           FROM glossary,&#10;            ((s&#10;             LEFT JOIN pgmetadata.theme gtheme ON ((gtheme.code = s.theme)))&#10;             LEFT JOIN spatial_ref_sys rs ON ((concat(rs.auth_name, ':', rs.auth_srid) = s.projection_authid)))&#10;        )&#10; SELECT ss.id,&#10;    ss.uid,&#10;    ss.table_name,&#10;    ss.schema_name,&#10;    ss.title,&#10;    ss.abstract,&#10;    string_agg(DISTINCT ss.cat, ', '::text ORDER BY ss.cat) AS categories,&#10;    string_agg(DISTINCT ss.theme, ', '::text ORDER BY ss.theme) AS themes,&#10;    ss.keywords,&#10;    ss.spatial_level,&#10;    ss.minimum_optimal_scale,&#10;    ss.maximum_optimal_scale,&#10;    ss.publication_date,&#10;    ss.publication_frequency,&#10;    ss.license,&#10;    ss.confidentiality,&#10;    ss.feature_count,&#10;    ss.geometry_type,&#10;    ss.projection_name,&#10;    ss.projection_authid,&#10;    ss.spatial_extent,&#10;    ss.creation_date,&#10;    ss.update_date&#10;   FROM ss&#10;  GROUP BY ss.id, ss.uid, ss.table_name, ss.schema_name, ss.title, ss.abstract, ss.keywords, ss.spatial_level, ss.minimum_optimal_scale, ss.maximum_optimal_scale, ss.publication_date, ss.publication_frequency, ss.license, ss.confidentiality, ss.feature_count, ss.geometry_type, ss.projection_name, ss.projection_authid, ss.spatial_extent, ss.creation_date, ss.update_date;">
+      <table name="v_dataset" numRows="0" remarks="Formatted version of dataset data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content." schema="pgmetadata" type="VIEW" viewSql=" WITH glossary AS (&#10;         SELECT COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        ), s AS (&#10;         SELECT d.id,&#10;            d.uid,&#10;            d.table_name,&#10;            d.schema_name,&#10;            d.title,&#10;            d.abstract,&#10;            d.categories,&#10;            d.themes,&#10;            d.keywords,&#10;            d.spatial_level,&#10;            d.minimum_optimal_scale,&#10;            d.maximum_optimal_scale,&#10;            d.publication_date,&#10;            d.publication_frequency,&#10;            d.license,&#10;            d.confidentiality,&#10;            d.feature_count,&#10;            d.geometry_type,&#10;            d.projection_name,&#10;            d.projection_authid,&#10;            d.spatial_extent,&#10;            d.creation_date,&#10;            d.update_date,&#10;            d.data_last_update,&#10;            d.geom,&#10;            cat.cat,&#10;            theme.theme&#10;           FROM ((pgmetadata.dataset d&#10;             LEFT JOIN LATERAL unnest(d.categories) cat(cat) ON (true))&#10;             LEFT JOIN LATERAL unnest(d.themes) theme(theme) ON (true))&#10;          WHERE true&#10;          ORDER BY d.id&#10;        ), ss AS (&#10;         SELECT s.id,&#10;            s.uid,&#10;            s.table_name,&#10;            s.schema_name,&#10;            s.title,&#10;            s.abstract,&#10;            ((((glossary.dict -&gt; 'dataset.categories'::text) -&gt; s.cat) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS cat,&#10;            gtheme.label AS theme,&#10;            s.keywords,&#10;            s.spatial_level,&#10;            ('1/'::text || s.minimum_optimal_scale) AS minimum_optimal_scale,&#10;            ('1/'::text || s.maximum_optimal_scale) AS maximum_optimal_scale,&#10;            s.publication_date,&#10;            ((((glossary.dict -&gt; 'dataset.publication_frequency'::text) -&gt; s.publication_frequency) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS publication_frequency,&#10;            ((((glossary.dict -&gt; 'dataset.license'::text) -&gt; s.license) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS license,&#10;            ((((glossary.dict -&gt; 'dataset.confidentiality'::text) -&gt; s.confidentiality) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS confidentiality,&#10;            s.feature_count,&#10;            s.geometry_type,&#10;            (regexp_split_to_array((rs.srtext)::text, '&quot;'::text))[2] AS projection_name,&#10;            s.projection_authid,&#10;            s.spatial_extent,&#10;            s.creation_date,&#10;            s.update_date,&#10;            s.data_last_update&#10;           FROM glossary,&#10;            ((s&#10;             LEFT JOIN pgmetadata.theme gtheme ON ((gtheme.code = s.theme)))&#10;             LEFT JOIN spatial_ref_sys rs ON ((concat(rs.auth_name, ':', rs.auth_srid) = s.projection_authid)))&#10;        )&#10; SELECT ss.id,&#10;    ss.uid,&#10;    ss.table_name,&#10;    ss.schema_name,&#10;    ss.title,&#10;    ss.abstract,&#10;    string_agg(DISTINCT ss.cat, ', '::text ORDER BY ss.cat) AS categories,&#10;    string_agg(DISTINCT ss.theme, ', '::text ORDER BY ss.theme) AS themes,&#10;    ss.keywords,&#10;    ss.spatial_level,&#10;    ss.minimum_optimal_scale,&#10;    ss.maximum_optimal_scale,&#10;    ss.publication_date,&#10;    ss.publication_frequency,&#10;    ss.license,&#10;    ss.confidentiality,&#10;    ss.feature_count,&#10;    ss.geometry_type,&#10;    ss.projection_name,&#10;    ss.projection_authid,&#10;    ss.spatial_extent,&#10;    ss.creation_date,&#10;    ss.update_date,&#10;    ss.data_last_update&#10;   FROM ss&#10;  GROUP BY ss.id, ss.uid, ss.table_name, ss.schema_name, ss.title, ss.abstract, ss.keywords, ss.spatial_level, ss.minimum_optimal_scale, ss.maximum_optimal_scale, ss.publication_date, ss.publication_frequency, ss.license, ss.confidentiality, ss.feature_count, ss.geometry_type, ss.projection_name, ss.projection_authid, ss.spatial_extent, ss.creation_date, ss.update_date, ss.data_last_update;">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="id" nullable="true" remarks="" size="10" type="int4" typeCode="4"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="uid" nullable="true" remarks="" size="2147483647" type="uuid" typeCode="1111"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="table_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
@@ -195,8 +202,15 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="20" name="spatial_extent" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="6" id="21" name="creation_date" nullable="true" remarks="" size="29" type="timestamp" typeCode="93"/>
          <column autoUpdated="false" defaultValue="null" digits="6" id="22" name="update_date" nullable="true" remarks="" size="29" type="timestamp" typeCode="93"/>
+         <column autoUpdated="false" defaultValue="null" digits="6" id="23" name="data_last_update" nullable="true" remarks="" size="29" type="timestamp" typeCode="93"/>
+      </table>
+      <table name="v_dataset_as_dcat" numRows="0" remarks="DCAT - View which formats the datasets AS DCAT XML record objects" schema="pgmetadata" type="VIEW" viewSql=" WITH glossary AS (&#10;         SELECT COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT d.schema_name,&#10;    d.table_name,&#10;    d.uid,&#10;    XMLELEMENT(NAME &quot;dcat:dataset&quot;, XMLELEMENT(NAME &quot;dcat:Dataset&quot;, XMLFOREST(d.uid AS &quot;dct:identifier&quot;, d.title AS &quot;dct:title&quot;, d.abstract AS &quot;dct:description&quot;, COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS &quot;dct:language&quot;, ((((glossary.dict -&gt; 'dataset.license'::text) -&gt; d.license) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS &quot;dct:license&quot;, ((((glossary.dict -&gt; 'dataset.confidentiality'::text) -&gt; d.confidentiality) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS &quot;dct:rights&quot;, ((((glossary.dict -&gt; 'dataset.publication_frequency'::text) -&gt; d.publication_frequency) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS &quot;dct:accrualPeriodicity&quot;, st_asgeojson(d.geom) AS &quot;dct:spatial&quot;), XMLELEMENT(NAME &quot;dct:created&quot;, XMLATTRIBUTES('http://www.w3.org/2001/XMLSchema#dateTime' AS &quot;rdf:datatype&quot;), d.creation_date), XMLELEMENT(NAME &quot;dct:issued&quot;, XMLATTRIBUTES('http://www.w3.org/2001/XMLSchema#dateTime' AS &quot;rdf:datatype&quot;), d.publication_date), XMLELEMENT(NAME &quot;dct:modified&quot;, XMLATTRIBUTES('http://www.w3.org/2001/XMLSchema#dateTime' AS &quot;rdf:datatype&quot;), d.update_date), ( SELECT xmlagg(XMLCONCAT(XMLELEMENT(NAME &quot;dcat:contactPoint&quot;, XMLELEMENT(NAME &quot;vcard:Organization&quot;, XMLELEMENT(NAME &quot;vcard:fn&quot;, btrim(concat(c.name, ' - ', c.organisation_name, ((' ('::text || c.organisation_unit) || ')'::text)))), XMLELEMENT(NAME &quot;vcard:hasEmail&quot;, XMLATTRIBUTES(c.email AS &quot;rdf:resource&quot;), c.email))), XMLELEMENT(NAME &quot;dct:creator&quot;, XMLELEMENT(NAME &quot;foaf:Organization&quot;, XMLELEMENT(NAME &quot;foaf:name&quot;, btrim(concat(c.name, ' - ', c.organisation_name, ((' ('::text || c.organisation_unit) || ')'::text)))), XMLELEMENT(NAME &quot;foaf:mbox&quot;, c.email))))) AS xmlagg&#10;           FROM (pgmetadata.contact c&#10;             JOIN pgmetadata.dataset_contact dc ON (((dc.contact_role = 'OW'::text) AND (dc.fk_id_dataset = d.id) AND (dc.fk_id_contact = c.id))))), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dct:publisher&quot;, XMLELEMENT(NAME &quot;foaf:Organization&quot;, XMLELEMENT(NAME &quot;foaf:name&quot;, btrim(concat(c.name, ' - ', c.organisation_name, ((' ('::text || c.organisation_unit) || ')'::text)))), XMLELEMENT(NAME &quot;foaf:mbox&quot;, c.email)))) AS xmlagg&#10;           FROM (pgmetadata.contact c&#10;             JOIN pgmetadata.dataset_contact dc ON (((dc.contact_role = 'DI'::text) AND (dc.fk_id_dataset = d.id) AND (dc.fk_id_contact = c.id))))), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:distribution&quot;, XMLELEMENT(NAME &quot;dcat:Distribution&quot;, XMLFOREST(l.name AS &quot;dct:title&quot;, l.description AS &quot;dct:description&quot;, l.url AS &quot;dcat:downloadURL&quot;, ((((glossary.dict -&gt; 'link.mime'::text) -&gt; l.mime) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS &quot;dcat:mediaType&quot;, COALESCE(l.format, ((((glossary.dict -&gt; 'link.type'::text) -&gt; l.type) -&gt; 'label'::text) -&gt;&gt; glossary.locale)) AS &quot;dct:format&quot;, l.size AS &quot;dct:bytesize&quot;)))) AS xmlagg&#10;           FROM pgmetadata.link l&#10;          WHERE (l.fk_id_dataset = d.id)), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:keyword&quot;, btrim(kw.kw))) AS xmlagg&#10;           FROM unnest(regexp_split_to_array(d.keywords, ','::text)) kw(kw)), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:theme&quot;, th.label)) AS xmlagg&#10;           FROM pgmetadata.theme th,&#10;            unnest(d.themes) cat(cat)&#10;          WHERE (th.code = cat.cat)), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:theme&quot;, ((((glossary.dict -&gt; 'dataset.categories'::text) -&gt; cat.cat) -&gt; 'label'::text) -&gt;&gt; glossary.locale))) AS xmlagg&#10;           FROM unnest(d.categories) cat(cat)))) AS dataset&#10;   FROM glossary,&#10;    pgmetadata.dataset d;">
+         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="schema_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="table_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="uid" nullable="true" remarks="" size="2147483647" type="uuid" typeCode="1111"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="dataset" nullable="true" remarks="" size="2147483647" type="xml" typeCode="2009"/>
       </table>
-      <table name="v_glossary" numRows="0" remarks="View transforming the glossary content into a JSON helping to localize a label or description by fetching directly the corresponding item. Ex: SET SESSION &quot;pgmetadata.locale&quot; = 'fr'; WITH glossary AS (SELECT dict FROM pgmetadata.v_glossary) SELECT (dict-&gt;'contact.contact_role'-&gt;'OW'-&gt;'label'-&gt;'fr')::text AS label FROM glossary;" schema="pgmetadata" type="VIEW" viewSql=" WITH one AS (&#10;         SELECT glossary.field,&#10;            glossary.code,&#10;            json_build_object('label', json_build_object('en', glossary.label, 'fr', COALESCE(NULLIF(glossary.label_fr, ''::text), glossary.label, ''::text)), 'description', json_build_object('en', glossary.description, 'fr', COALESCE(NULLIF(glossary.description_fr, ''::text), glossary.description, ''::text))) AS dict&#10;           FROM pgmetadata.glossary&#10;        ), two AS (&#10;         SELECT one.field,&#10;            json_object_agg(one.code, one.dict) AS dict&#10;           FROM one&#10;          GROUP BY one.field&#10;        )&#10; SELECT json_object_agg(two.field, two.dict) AS dict&#10;   FROM two;">
+      <table name="v_glossary" numRows="0" remarks="View transforming the glossary content into a JSON helping to localize a label or description by fetching directly the corresponding item. Ex: SET SESSION &quot;pgmetadata.locale&quot; = 'fr'; WITH glossary AS (SELECT dict FROM pgmetadata.v_glossary) SELECT (dict-&gt;'contact.contact_role'-&gt;'OW'-&gt;'label'-&gt;'fr')::text AS label FROM glossary;" schema="pgmetadata" type="VIEW" viewSql=" WITH one AS (&#10;         SELECT glossary.field,&#10;            glossary.code,&#10;            json_build_object('label', json_build_object('en', glossary.label_en, 'fr', COALESCE(NULLIF(glossary.label_fr, ''::text), glossary.label_en, ''::text), 'it', COALESCE(NULLIF(glossary.label_it, ''::text), glossary.label_en, ''::text), 'es', COALESCE(NULLIF(glossary.label_es, ''::text), glossary.label_en, ''::text), 'de', COALESCE(NULLIF(glossary.label_de, ''::text), glossary.label_en, ''::text)), 'description', json_build_object('en', glossary.description_en, 'fr', COALESCE(NULLIF(glossary.description_fr, ''::text), glossary.description_en, ''::text), 'it', COALESCE(NULLIF(glossary.description_it, ''::text), glossary.description_en, ''::text), 'es', COALESCE(NULLIF(glossary.description_es, ''::text), glossary.description_en, ''::text), 'de', COALESCE(NULLIF(glossary.description_de, ''::text), glossary.description_en, ''::text))) AS dict&#10;           FROM pgmetadata.glossary&#10;        ), two AS (&#10;         SELECT one.field,&#10;            json_object_agg(one.code, one.dict) AS dict&#10;           FROM one&#10;          GROUP BY one.field&#10;        )&#10; SELECT json_object_agg(two.field, two.dict) AS dict&#10;   FROM two;">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="dict" nullable="true" remarks="" size="2147483647" type="json" typeCode="1111"/>
       </table>
       <table name="v_link" numRows="0" remarks="Formatted version of link data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content." schema="pgmetadata" type="VIEW" viewSql=" WITH glossary AS (&#10;         SELECT COALESCE(current_setting('pgmetadata.locale'::text, true), 'en'::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT l.id,&#10;    d.table_name,&#10;    d.schema_name,&#10;    l.name,&#10;    l.type,&#10;    ((((glossary.dict -&gt; 'link.type'::text) -&gt; l.type) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS type_label,&#10;    l.url,&#10;    l.description,&#10;    l.format,&#10;    l.mime,&#10;    ((((glossary.dict -&gt; 'link.mime'::text) -&gt; l.mime) -&gt; 'label'::text) -&gt;&gt; glossary.locale) AS mime_label,&#10;    l.size&#10;   FROM glossary,&#10;    (pgmetadata.link l&#10;     JOIN pgmetadata.dataset d ON ((d.id = l.fk_id_dataset)))&#10;  WHERE true&#10;  ORDER BY l.id;">
@@ -213,6 +227,9 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="10" name="mime_label" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="11" name="size" nullable="true" remarks="" size="10" type="int4" typeCode="4"/>
       </table>
+      <table name="v_locales" numRows="0" remarks="Lists the locales available in the glossary, by listing the columns label_xx of the table pgmetadata.glossary" schema="pgmetadata" type="VIEW" viewSql=" SELECT 'en'::text AS locale&#10;UNION&#10; SELECT replace((columns.column_name)::text, 'label_'::text, ''::text) AS locale&#10;   FROM information_schema.columns&#10;  WHERE (((columns.table_schema)::text = 'pgmetadata'::text) AND ((columns.table_name)::text = 'glossary'::text) AND ((columns.column_name)::text ~~ 'label_%'::text))&#10;  ORDER BY 1;">
+         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="locale" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
+      </table>
       <table name="v_orphan_dataset_items" numRows="0" remarks="View containing the tables referenced in dataset but not existing in the database itself." schema="pgmetadata" type="VIEW" viewSql=" SELECT row_number() OVER () AS id,&#10;    d.schema_name,&#10;    d.table_name&#10;   FROM (pgmetadata.dataset d&#10;     LEFT JOIN pg_tables t ON (((d.schema_name = (t.schemaname)::text) AND (d.table_name = (t.tablename)::text))))&#10;  WHERE (t.tablename IS NULL)&#10;  ORDER BY d.schema_name, d.table_name;">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="id" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="schema_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
@@ -402,6 +419,45 @@ BEGIN
 
     RETURN html;
 
+END;
+]]></definition>
+      </routine>
+      <routine dataAccess="MODIFIES" deterministic="false" name="get_datasets_as_dcat_xml" returnType="SETOF record" securityType="INVOKER" type="FUNCTION">
+         <comment><![CDATA[Get the datasets records as XML DCAT datasets for the given locale.]]></comment>
+         <definition language="PLPGSQL"><![CDATA[
+DECLARE
+    locale_exists boolean;
+    item record;
+    dataset_rec record;
+    sql_text text;
+    json_data json;
+    html text;
+    html_contact text;
+    html_link text;
+    html_main text;
+BEGIN
+
+    -- Check if the _locale parameter corresponds to the available locales
+    _locale = lower(_locale);
+    SELECT _locale IN (SELECT locale FROM pgmetadata.v_locales)
+    INTO locale_exists
+    ;
+    IF NOT locale_exists THEN
+        _locale = 'en';
+    END IF;
+
+    -- Set locale
+    -- We must use EXECUTE in order to have _locale to be correctly interpreted
+    sql_text = concat('SET SESSION "pgmetadata.locale" = ', quote_literal(_locale));
+    EXECUTE sql_text;
+
+    -- Return content
+    RETURN QUERY
+    SELECT
+    *
+    FROM pgmetadata.v_dataset_as_dcat
+    ;
+
 END;
 ]]></definition>
       </routine>
diff --git a/docs/database/index.html b/docs/database/index.html
index c5c826de..f6167cff 100644
--- a/docs/database/index.html
+++ b/docs/database/index.html
@@ -78,7 +78,7 @@ <h1>Tables</h1><br />
                         <div class="col-md-12">
                             <div class="callout callout-info">
                                 <h4>SchemaSpy Analysis of gis</h4>
-                                <p>Generated on Mon Jan 04 10:56 GMT 2021</p>
+                                <p>Generated on Thu Jan 21 09:55 GMT 2021</p>
                             </div>
                         </div>
                     </div>
@@ -106,7 +106,7 @@ <h4>SchemaSpy Analysis of gis</h4>
                                 <span class="info-box-icon bg-teal"><i class="fa fa-table"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">VIEWS</span>
-                                    <span class="info-box-number">10</span>
+                                    <span class="info-box-number">12</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -118,7 +118,7 @@ <h4>SchemaSpy Analysis of gis</h4>
                                 <span class="info-box-icon bg-green"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">COLUMNS</span>
-                                    <span class="info-box-number">121</span>
+                                    <span class="info-box-number">134</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -154,7 +154,7 @@ <h4>SchemaSpy Analysis of gis</h4>
                                 <span class="info-box-icon bg-navy"><i class="fa fa-file-code-o" aria-hidden="true"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">Routines</span>
-                                    <span class="info-box-number">6</span>
+                                    <span class="info-box-number">7</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -257,7 +257,7 @@ <h3 class="box-title">Tables</h3>
                                         <td class="detail"><a href="tables/glossary.html">glossary</a></td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">8</td>
+                                        <td class="detail" align="right">14</td>
                                         <td class="detail" align="right">129</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"><p>List of labels and words used as labels for stored data</p></td>
@@ -275,7 +275,7 @@ <h3 class="box-title">Tables</h3>
                                         <td class="detail"><a href="tables/v_dataset.html">v_dataset</a></td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">23</td>
+                                        <td class="detail" align="right">24</td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">View</td>
                                         <td class="comment detail" style="display: table-cell;"><p>Formatted version of dataset data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content.</p></td>
@@ -298,11 +298,29 @@ <h3 class="box-title">Tables</h3>
                                         <td class="detail" align="right">View</td>
                                         <td class="comment detail" style="display: table-cell;"><p>View transforming the glossary content into a JSON helping to localize a label or description by fetching directly the corresponding item. Ex: SET SESSION &ldquo;pgmetadata.locale&rdquo; = &lsquo;fr&rsquo;; WITH glossary AS (SELECT dict FROM pgmetadata.v_glossary) SELECT (dict-&gt;&lsquo;contact.contact_role&rsquo;-&gt;&lsquo;OW&rsquo;-&gt;&lsquo;label&rsquo;-&gt;&lsquo;fr&rsquo;)::text AS label FROM glossary;</p></td>
                                     </tr>
+                                    <tr class="tbl even" valign="top">
+                                        <td class="detail"><a href="tables/v_locales.html">v_locales</a></td>
+                                        <td class="detail" align="right">0</td>
+                                        <td class="detail" align="right">0</td>
+                                        <td class="detail" align="right">1</td>
+                                        <td class="detail" align="right">0</td>
+                                        <td class="detail" align="right">View</td>
+                                        <td class="comment detail" style="display: table-cell;"><p>Lists the locales available in the glossary, by listing the columns label_xx of the table pgmetadata.glossary</p></td>
+                                    </tr>
+                                    <tr class="tbl even" valign="top">
+                                        <td class="detail"><a href="tables/v_dataset_as_dcat.html">v_dataset_as_dcat</a></td>
+                                        <td class="detail" align="right">0</td>
+                                        <td class="detail" align="right">0</td>
+                                        <td class="detail" align="right">4</td>
+                                        <td class="detail" align="right">0</td>
+                                        <td class="detail" align="right">View</td>
+                                        <td class="comment detail" style="display: table-cell;"><p>DCAT - View which formats the datasets AS DCAT XML record objects</p></td>
+                                    </tr>
                                     <tr class="tbl even" valign="top">
                                         <td class="detail"><a href="tables/v_contact.html">v_contact</a></td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">7</td>
+                                        <td class="detail" align="right">8</td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">View</td>
                                         <td class="comment detail" style="display: table-cell;"><p>Formatted version of contact data, with all the codes replaced by corresponding labels taken from pgmetadata.glossary. Used in the function in charge of building the HTML metadata content. The localized version of labels and descriptions are taken considering the session setting &lsquo;pgmetadata.locale&rsquo;. For example with: SET SESSION &ldquo;pgmetadata.locale&rdquo; = &lsquo;fr&rsquo;;</p></td>
diff --git a/docs/database/info-html.txt b/docs/database/info-html.txt
index ca4eb439..293f8900 100644
--- a/docs/database/info-html.txt
+++ b/docs/database/info-html.txt
@@ -1,5 +1,5 @@
-date=2021-01-04 10:56:34+0000
-os=Linux 5.4.0-58-generic
+date=2021-01-21 09:55:57+0000
+os=Linux 5.8.0-38-generic
 schemaspy-version=6.1.0
 schemaspy-build=6.1.0.41 2019-09-17 21:52:57
 diagramImplementation=Graphviz dot 2.38
diff --git a/docs/database/orphans.html b/docs/database/orphans.html
index 15488c4d..6a1e0369 100644
--- a/docs/database/orphans.html
+++ b/docs/database/orphans.html
@@ -104,7 +104,7 @@ <h3 class="box-title">Orphan Tables</h3>
 </map><map id="theme" name="theme">
 <area shape="rect" id="node1" href="tables/theme.html" target="_top" title="theme" alt="" coords="5,5,284,192">
 </map><map id="glossary" name="glossary">
-<area shape="rect" id="node1" href="tables/glossary.html" target="_top" title="glossary" alt="" coords="5,5,304,309">
+<area shape="rect" id="node1" href="tables/glossary.html" target="_top" title="glossary" alt="" coords="5,5,311,485">
 </map>
                         </div>
                     </div>
diff --git a/docs/database/routines.html b/docs/database/routines.html
index 3a99ae4f..84046094 100644
--- a/docs/database/routines.html
+++ b/docs/database/routines.html
@@ -134,6 +134,15 @@ <h3 class="box-title">Routines</h3>
 FROM pgmetadata.v_table_comment_from_metadata AS v
 </code></pre></td>
                                     </tr>
+                                    <tr>
+                                        <td><a href="routines/get_datasets_as_dcat_xml.html">get_datasets_as_dcat_xml</a></td>
+                                        <td>FUNCTION</td>
+                                        <td>PLPGSQL</td>
+                                        <td>false</td>
+                                        <td>SETOF record</td>
+                                        <td>INVOKER</td>
+                                        <td><p>Get the datasets records as XML DCAT datasets for the given locale.</p></td>
+                                    </tr>
                                     <tr>
                                         <td><a href="routines/refresh_dataset_calculated_fields.html">refresh_dataset_calculated_fields</a></td>
                                         <td>FUNCTION</td>
diff --git a/docs/database/routines/get_datasets_as_dcat_xml.html b/docs/database/routines/get_datasets_as_dcat_xml.html
new file mode 100644
index 00000000..f2c65b16
--- /dev/null
+++ b/docs/database/routines/get_datasets_as_dcat_xml.html
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>gis Database</title>
+        <!-- Tell the browser to be responsive to screen width -->
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
+        <!-- Bootstrap 3.3.5 -->
+        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome -->
+        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
+        <!-- Ionicons -->
+        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
+        <!-- DataTables -->
+        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
+        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
+        <!-- Code Mirror -->
+        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
+        <!-- Fonts -->
+        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
+        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
+
+        <!-- Theme style -->
+        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
+        <!-- Salvattore -->
+        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
+        <!-- AdminLTE Skins. Choose a skin from the css/skins
+           folder instead of downloading all of them to reduce the load. -->
+        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
+        <!-- SchemaSpy -->
+        <link rel="stylesheet" href="../schemaSpy.css">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="../bower/html5shiv/html5shiv.min.js"></script>
+        <script src="../bower/respond/respond.min.js"></script>
+        <![endif]-->
+    </head>
+    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
+    <body class="hold-transition skin-blue layout-top-nav">
+        <div class="wrapper">
+            <header class="main-header">
+                <nav class="navbar navbar-static-top">
+                    <div class="container">
+                        <div class="navbar-header">
+                            <a href="../index.html" class="navbar-brand"><b>gis</b> Database</a>
+                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
+                        </div>
+
+                        <!-- Collect the nav links, forms, and other content for toggling -->
+                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                            <ul class="nav navbar-nav">
+                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
+                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
+                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
+                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
+                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
+                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
+                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
+                            </ul>
+                        </div>
+                        <!-- /.navbar-collapse -->
+                        <!-- Navbar Right Menu -->
+                    </div>
+                    <!-- /.container-fluid -->
+                </nav>
+            </header>
+            <!-- Main content -->
+            <!-- Full Width Column -->
+            <div class="content-wrapper">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1>get_datasets_as_dcat_xml</h1><br />
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-file-text-o"></i>
+                            <h3 id="Description" class="box-title">Description</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <!-- /.box-header -->
+                        <div class="box-body clearfix">
+                            <p><p>Get the datasets records as XML DCAT datasets for the given locale.</p></p>
+                        </div>
+                        <!-- /.box-body -->
+                    </div>
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
+                            <h3 id="Columns" class="box-title">Parameters</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <table id="standard_table" class="table table-bordered table-striped dataTable" role="grid">
+                                <thead align='left'>
+                                <tr>
+                                    <th>Name</th>
+                                    <th>Type</th>
+                                    <th>Mode</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td>_locale</td>
+                                    <td>text</td>
+                                    <td>IN</td>
+                                </tr>
+                                <tr>
+                                    <td>schema_name</td>
+                                    <td>text</td>
+                                    <td>OUT</td>
+                                </tr>
+                                <tr>
+                                    <td>table_name</td>
+                                    <td>text</td>
+                                    <td>OUT</td>
+                                </tr>
+                                <tr>
+                                    <td>uid</td>
+                                    <td>uuid</td>
+                                    <td>OUT</td>
+                                </tr>
+                                <tr>
+                                    <td>dataset</td>
+                                    <td>xml</td>
+                                    <td>OUT</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-file-code-o"></i>
+                            <h3 id="RoutineDefinition" class="box-title">Definition</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">&#10;DECLARE&#10;    locale_exists boolean;&#10;    item record;&#10;    dataset_rec record;&#10;    sql_text text;&#10;    json_data json;&#10;    html text;&#10;    html_contact text;&#10;    html_link text;&#10;    html_main text;&#10;BEGIN&#10;&#10;    -- Check if the _locale parameter corresponds to the available locales&#10;    _locale = lower(_locale);&#10;    SELECT _locale IN (SELECT locale FROM pgmetadata.v_locales)&#10;    INTO locale_exists&#10;    ;&#10;    IF NOT locale_exists THEN&#10;        _locale = &#39;en&#39;;&#10;    END IF;&#10;&#10;    -- Set locale&#10;    -- We must use EXECUTE in order to have _locale to be correctly interpreted&#10;    sql_text = concat(&#39;SET SESSION &quot;pgmetadata.locale&quot; = &#39;, quote_literal(_locale));&#10;    EXECUTE sql_text;&#10;&#10;    -- Return content&#10;    RETURN QUERY&#10;    SELECT&#10;    *&#10;    FROM pgmetadata.v_dataset_as_dcat&#10;    ;&#10;&#10;END;&#10;</textarea>
+                        </div>
+                    </div>
+                </section>
+            </div>
+            <!-- /.content-wrapper -->
+            <footer class="main-footer">
+                <div>
+                    <div class="pull-right hidden-xs">
+                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
+                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
+                    </div>
+                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.1.0</a></strong>
+                </div>
+                <!-- /.container -->
+            </footer>
+        </div>
+        <!-- ./wrapper -->
+
+        <!-- jQuery 2.2.3 -->
+        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
+        <!-- Bootstrap 3.3.5 -->
+        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
+        <!-- DataTables -->
+        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
+        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
+        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
+        <!-- SheetJS -->
+        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
+        <!-- pdfmake -->
+        <script src="../bower/pdfmake/pdfmake.min.js"></script>
+        <script src="../bower/pdfmake/vfs_fonts.js"></script>
+        <!-- SlimScroll -->
+        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+        <!-- FastClick -->
+        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
+        <!-- Salvattore -->
+        <script src="../bower/salvattore/salvattore.min.js"></script>
+        <!-- AnchorJS -->
+        <script src="../bower/anchor-js/anchor.min.js"></script>
+        <!-- CodeMirror -->
+        <script src="../bower/codemirror/codemirror.js"></script>
+        <script src="../bower/codemirror/sql.js"></script>
+        <!-- AdminLTE App -->
+        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
+        <script src="routine.js"></script>
+        <script src="../schemaSpy.js"></script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/docs/database/tables/glossary.html b/docs/database/tables/glossary.html
index d9e1df67..525cd4ef 100644
--- a/docs/database/tables/glossary.html
+++ b/docs/database/tables/glossary.html
@@ -167,7 +167,7 @@ <h3 id="Columns" class="box-title">Columns</h3>
                                     <td><p>Item code</p></td>
                                 </tr>
                                 <tr>
-                                    <td><span id="label">label</span></td>
+                                    <td><span id="label_en">label_en</span></td>
                                     <td>text</td>
                                     <td>2147483647</td>
                                     <td title=''></td>
@@ -184,7 +184,7 @@ <h3 id="Columns" class="box-title">Columns</h3>
                                     <td><p>Item label</p></td>
                                 </tr>
                                 <tr>
-                                    <td><span id="description">description</span></td>
+                                    <td><span id="description_en">description_en</span></td>
                                     <td>text</td>
                                     <td>2147483647</td>
                                     <td title='nullable'>√</td>
@@ -251,6 +251,108 @@ <h3 id="Columns" class="box-title">Columns</h3>
                                     </td>
                                     <td></td>
                                 </tr>
+                                <tr>
+                                    <td><span id="label_it">label_it</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="description_it">description_it</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="label_es">label_es</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="description_es">description_es</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="label_de">label_de</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="description_de">description_de</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
diff --git a/docs/database/tables/v_contact.html b/docs/database/tables/v_contact.html
index 2e24cfcb..b5099ab2 100644
--- a/docs/database/tables/v_contact.html
+++ b/docs/database/tables/v_contact.html
@@ -217,6 +217,23 @@ <h3 id="Columns" class="box-title">Columns</h3>
                                     </td>
                                     <td></td>
                                 </tr>
+                                <tr>
+                                    <td><span id="contact_role_code">contact_role_code</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
                                 <tr>
                                     <td><span id="email">email</span></td>
                                     <td>text</td>
@@ -248,7 +265,7 @@ <h3 id="ViewDefinition" class="box-title">View Definition</h3>
                             </div>
                         </div>
                         <div class="box-body">
-                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH glossary AS (&#10;         SELECT COALESCE(current_setting(&#39;pgmetadata.locale&#39;::text, true), &#39;en&#39;::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT d.table_name,&#10;    d.schema_name,&#10;    c.name,&#10;    c.organisation_name,&#10;    c.organisation_unit,&#10;    ((((glossary.dict -&gt; &#39;contact.contact_role&#39;::text) -&gt; dc.contact_role) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS contact_role,&#10;    c.email&#10;   FROM glossary,&#10;    ((pgmetadata.dataset_contact dc&#10;     JOIN pgmetadata.dataset d ON ((d.id = dc.fk_id_dataset)))&#10;     JOIN pgmetadata.contact c ON ((dc.fk_id_contact = c.id)))&#10;  WHERE true&#10;  ORDER BY dc.id;</textarea>
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH glossary AS (&#10;         SELECT COALESCE(current_setting(&#39;pgmetadata.locale&#39;::text, true), &#39;en&#39;::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT d.table_name,&#10;    d.schema_name,&#10;    c.name,&#10;    c.organisation_name,&#10;    c.organisation_unit,&#10;    ((((glossary.dict -&gt; &#39;contact.contact_role&#39;::text) -&gt; dc.contact_role) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS contact_role,&#10;    dc.contact_role AS contact_role_code,&#10;    c.email&#10;   FROM glossary,&#10;    ((pgmetadata.dataset_contact dc&#10;     JOIN pgmetadata.dataset d ON ((d.id = dc.fk_id_dataset)))&#10;     JOIN pgmetadata.contact c ON ((dc.fk_id_contact = c.id)))&#10;  WHERE true&#10;  ORDER BY dc.id;</textarea>
                             <div style="padding-top: 5px;"><hr></div>
                             <div class="box box-solid">
                                 <div class="box-header with-border">
diff --git a/docs/database/tables/v_dataset.html b/docs/database/tables/v_dataset.html
index f7e71090..9d246d08 100644
--- a/docs/database/tables/v_dataset.html
+++ b/docs/database/tables/v_dataset.html
@@ -506,6 +506,23 @@ <h3 id="Columns" class="box-title">Columns</h3>
                                     </td>
                                     <td></td>
                                 </tr>
+                                <tr>
+                                    <td><span id="data_last_update">data_last_update</span></td>
+                                    <td>timestamp</td>
+                                    <td>29,6</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -520,7 +537,7 @@ <h3 id="ViewDefinition" class="box-title">View Definition</h3>
                             </div>
                         </div>
                         <div class="box-body">
-                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH glossary AS (&#10;         SELECT COALESCE(current_setting(&#39;pgmetadata.locale&#39;::text, true), &#39;en&#39;::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        ), s AS (&#10;         SELECT d.id,&#10;            d.uid,&#10;            d.table_name,&#10;            d.schema_name,&#10;            d.title,&#10;            d.abstract,&#10;            d.categories,&#10;            d.themes,&#10;            d.keywords,&#10;            d.spatial_level,&#10;            d.minimum_optimal_scale,&#10;            d.maximum_optimal_scale,&#10;            d.publication_date,&#10;            d.publication_frequency,&#10;            d.license,&#10;            d.confidentiality,&#10;            d.feature_count,&#10;            d.geometry_type,&#10;            d.projection_name,&#10;            d.projection_authid,&#10;            d.spatial_extent,&#10;            d.creation_date,&#10;            d.update_date,&#10;            d.geom,&#10;            cat.cat,&#10;            theme.theme&#10;           FROM ((pgmetadata.dataset d&#10;             LEFT JOIN LATERAL unnest(d.categories) cat(cat) ON (true))&#10;             LEFT JOIN LATERAL unnest(d.themes) theme(theme) ON (true))&#10;          WHERE true&#10;          ORDER BY d.id&#10;        ), ss AS (&#10;         SELECT s.id,&#10;            s.uid,&#10;            s.table_name,&#10;            s.schema_name,&#10;            s.title,&#10;            s.abstract,&#10;            ((((glossary.dict -&gt; &#39;dataset.categories&#39;::text) -&gt; s.cat) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS cat,&#10;            gtheme.label AS theme,&#10;            s.keywords,&#10;            s.spatial_level,&#10;            (&#39;1/&#39;::text || s.minimum_optimal_scale) AS minimum_optimal_scale,&#10;            (&#39;1/&#39;::text || s.maximum_optimal_scale) AS maximum_optimal_scale,&#10;            s.publication_date,&#10;            ((((glossary.dict -&gt; &#39;dataset.publication_frequency&#39;::text) -&gt; s.publication_frequency) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS publication_frequency,&#10;            ((((glossary.dict -&gt; &#39;dataset.license&#39;::text) -&gt; s.license) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS license,&#10;            ((((glossary.dict -&gt; &#39;dataset.confidentiality&#39;::text) -&gt; s.confidentiality) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS confidentiality,&#10;            s.feature_count,&#10;            s.geometry_type,&#10;            (regexp_split_to_array((rs.srtext)::text, &#39;&quot;&#39;::text))[2] AS projection_name,&#10;            s.projection_authid,&#10;            s.spatial_extent,&#10;            s.creation_date,&#10;            s.update_date&#10;           FROM glossary,&#10;            ((s&#10;             LEFT JOIN pgmetadata.theme gtheme ON ((gtheme.code = s.theme)))&#10;             LEFT JOIN spatial_ref_sys rs ON ((concat(rs.auth_name, &#39;:&#39;, rs.auth_srid) = s.projection_authid)))&#10;        )&#10; SELECT ss.id,&#10;    ss.uid,&#10;    ss.table_name,&#10;    ss.schema_name,&#10;    ss.title,&#10;    ss.abstract,&#10;    string_agg(DISTINCT ss.cat, &#39;, &#39;::text ORDER BY ss.cat) AS categories,&#10;    string_agg(DISTINCT ss.theme, &#39;, &#39;::text ORDER BY ss.theme) AS themes,&#10;    ss.keywords,&#10;    ss.spatial_level,&#10;    ss.minimum_optimal_scale,&#10;    ss.maximum_optimal_scale,&#10;    ss.publication_date,&#10;    ss.publication_frequency,&#10;    ss.license,&#10;    ss.confidentiality,&#10;    ss.feature_count,&#10;    ss.geometry_type,&#10;    ss.projection_name,&#10;    ss.projection_authid,&#10;    ss.spatial_extent,&#10;    ss.creation_date,&#10;    ss.update_date&#10;   FROM ss&#10;  GROUP BY ss.id, ss.uid, ss.table_name, ss.schema_name, ss.title, ss.abstract, ss.keywords, ss.spatial_level, ss.minimum_optimal_scale, ss.maximum_optimal_scale, ss.publication_date, ss.publication_frequency, ss.license, ss.confidentiality, ss.feature_count, ss.geometry_type, ss.projection_name, ss.projection_authid, ss.spatial_extent, ss.creation_date, ss.update_date;</textarea>
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH glossary AS (&#10;         SELECT COALESCE(current_setting(&#39;pgmetadata.locale&#39;::text, true), &#39;en&#39;::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        ), s AS (&#10;         SELECT d.id,&#10;            d.uid,&#10;            d.table_name,&#10;            d.schema_name,&#10;            d.title,&#10;            d.abstract,&#10;            d.categories,&#10;            d.themes,&#10;            d.keywords,&#10;            d.spatial_level,&#10;            d.minimum_optimal_scale,&#10;            d.maximum_optimal_scale,&#10;            d.publication_date,&#10;            d.publication_frequency,&#10;            d.license,&#10;            d.confidentiality,&#10;            d.feature_count,&#10;            d.geometry_type,&#10;            d.projection_name,&#10;            d.projection_authid,&#10;            d.spatial_extent,&#10;            d.creation_date,&#10;            d.update_date,&#10;            d.data_last_update,&#10;            d.geom,&#10;            cat.cat,&#10;            theme.theme&#10;           FROM ((pgmetadata.dataset d&#10;             LEFT JOIN LATERAL unnest(d.categories) cat(cat) ON (true))&#10;             LEFT JOIN LATERAL unnest(d.themes) theme(theme) ON (true))&#10;          WHERE true&#10;          ORDER BY d.id&#10;        ), ss AS (&#10;         SELECT s.id,&#10;            s.uid,&#10;            s.table_name,&#10;            s.schema_name,&#10;            s.title,&#10;            s.abstract,&#10;            ((((glossary.dict -&gt; &#39;dataset.categories&#39;::text) -&gt; s.cat) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS cat,&#10;            gtheme.label AS theme,&#10;            s.keywords,&#10;            s.spatial_level,&#10;            (&#39;1/&#39;::text || s.minimum_optimal_scale) AS minimum_optimal_scale,&#10;            (&#39;1/&#39;::text || s.maximum_optimal_scale) AS maximum_optimal_scale,&#10;            s.publication_date,&#10;            ((((glossary.dict -&gt; &#39;dataset.publication_frequency&#39;::text) -&gt; s.publication_frequency) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS publication_frequency,&#10;            ((((glossary.dict -&gt; &#39;dataset.license&#39;::text) -&gt; s.license) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS license,&#10;            ((((glossary.dict -&gt; &#39;dataset.confidentiality&#39;::text) -&gt; s.confidentiality) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS confidentiality,&#10;            s.feature_count,&#10;            s.geometry_type,&#10;            (regexp_split_to_array((rs.srtext)::text, &#39;&quot;&#39;::text))[2] AS projection_name,&#10;            s.projection_authid,&#10;            s.spatial_extent,&#10;            s.creation_date,&#10;            s.update_date,&#10;            s.data_last_update&#10;           FROM glossary,&#10;            ((s&#10;             LEFT JOIN pgmetadata.theme gtheme ON ((gtheme.code = s.theme)))&#10;             LEFT JOIN spatial_ref_sys rs ON ((concat(rs.auth_name, &#39;:&#39;, rs.auth_srid) = s.projection_authid)))&#10;        )&#10; SELECT ss.id,&#10;    ss.uid,&#10;    ss.table_name,&#10;    ss.schema_name,&#10;    ss.title,&#10;    ss.abstract,&#10;    string_agg(DISTINCT ss.cat, &#39;, &#39;::text ORDER BY ss.cat) AS categories,&#10;    string_agg(DISTINCT ss.theme, &#39;, &#39;::text ORDER BY ss.theme) AS themes,&#10;    ss.keywords,&#10;    ss.spatial_level,&#10;    ss.minimum_optimal_scale,&#10;    ss.maximum_optimal_scale,&#10;    ss.publication_date,&#10;    ss.publication_frequency,&#10;    ss.license,&#10;    ss.confidentiality,&#10;    ss.feature_count,&#10;    ss.geometry_type,&#10;    ss.projection_name,&#10;    ss.projection_authid,&#10;    ss.spatial_extent,&#10;    ss.creation_date,&#10;    ss.update_date,&#10;    ss.data_last_update&#10;   FROM ss&#10;  GROUP BY ss.id, ss.uid, ss.table_name, ss.schema_name, ss.title, ss.abstract, ss.keywords, ss.spatial_level, ss.minimum_optimal_scale, ss.maximum_optimal_scale, ss.publication_date, ss.publication_frequency, ss.license, ss.confidentiality, ss.feature_count, ss.geometry_type, ss.projection_name, ss.projection_authid, ss.spatial_extent, ss.creation_date, ss.update_date, ss.data_last_update;</textarea>
                             <div style="padding-top: 5px;"><hr></div>
                             <div class="box box-solid">
                                 <div class="box-header with-border">
diff --git a/docs/database/tables/v_dataset_as_dcat.html b/docs/database/tables/v_dataset_as_dcat.html
new file mode 100644
index 00000000..583677f9
--- /dev/null
+++ b/docs/database/tables/v_dataset_as_dcat.html
@@ -0,0 +1,277 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>v_dataset_as_dcat - gis Database</title>
+        <!-- Tell the browser to be responsive to screen width -->
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
+        <!-- Bootstrap 3.3.5 -->
+        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome -->
+        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
+        <!-- Ionicons -->
+        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
+        <!-- DataTables -->
+        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
+        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
+        <!-- Code Mirror -->
+        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
+        <!-- Fonts -->
+        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
+        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
+
+        <!-- Theme style -->
+        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
+        <!-- Salvattore -->
+        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
+        <!-- AdminLTE Skins. Choose a skin from the css/skins
+           folder instead of downloading all of them to reduce the load. -->
+        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
+        <!-- SchemaSpy -->
+        <link rel="stylesheet" href="../schemaSpy.css">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="../bower/html5shiv/html5shiv.min.js"></script>
+        <script src="../bower/respond/respond.min.js"></script>
+        <![endif]-->
+    </head>
+    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
+    <body class="hold-transition skin-blue layout-top-nav">
+        <div class="wrapper">
+            <header class="main-header">
+                <nav class="navbar navbar-static-top">
+                    <div class="container">
+                        <div class="navbar-header">
+                            <a href="../index.html" class="navbar-brand"><b>gis</b> Database</a>
+                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
+                        </div>
+
+                        <!-- Collect the nav links, forms, and other content for toggling -->
+                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                            <ul class="nav navbar-nav">
+                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
+                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
+                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
+                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
+                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
+                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
+                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
+                            </ul>
+                        </div>
+                        <!-- /.navbar-collapse -->
+                        <!-- Navbar Right Menu -->
+                    </div>
+                    <!-- /.container-fluid -->
+                </nav>
+            </header>
+            <!-- Main content -->
+            <!-- Full Width Column -->
+            <div class="content-wrapper">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1>v_dataset_as_dcat</h1><p><span id="recordNumber">0</span> rows</p><br />
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-file-text-o"></i>
+                            <h3 id="Description" class="box-title">Description</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div><!-- /.box-header -->
+                        <div class="box-body clearfix">
+                            <p>DCAT - View which formats the datasets AS DCAT XML record objects</p>
+                        </div><!-- /.box-body -->
+                    </div>
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
+                            <h3 id="Columns" class="box-title">Columns</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <table id="standard_table" class="table table-bordered table-striped dataTable" role="grid">
+                                <thead align='left'>
+                                <tr>
+                                    <th>Column</th>
+                                    <th>Type</th>
+                                    <th>Size</th>
+                                    <th title='Are nulls allowed?'>Nulls</th>
+                                    <th title='Is column automatically updated?'>Auto</th>
+                                    <th title='Default value'>Default</th>
+                                    <th title='Columns in tables that reference this column'>Children</th>
+                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
+                                    <th title='Comments' class="toggle"><span>Comments</span></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td><span id="schema_name">schema_name</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="table_name">table_name</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="uid">uid</span></td>
+                                    <td>uuid</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="dataset">dataset</span></td>
+                                    <td>xml</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-file-code-o"></i>
+                            <h3 id="ViewDefinition" class="box-title">View Definition</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH glossary AS (&#10;         SELECT COALESCE(current_setting(&#39;pgmetadata.locale&#39;::text, true), &#39;en&#39;::text) AS locale,&#10;            v_glossary.dict&#10;           FROM pgmetadata.v_glossary&#10;        )&#10; SELECT d.schema_name,&#10;    d.table_name,&#10;    d.uid,&#10;    XMLELEMENT(NAME &quot;dcat:dataset&quot;, XMLELEMENT(NAME &quot;dcat:Dataset&quot;, XMLFOREST(d.uid AS &quot;dct:identifier&quot;, d.title AS &quot;dct:title&quot;, d.abstract AS &quot;dct:description&quot;, COALESCE(current_setting(&#39;pgmetadata.locale&#39;::text, true), &#39;en&#39;::text) AS &quot;dct:language&quot;, ((((glossary.dict -&gt; &#39;dataset.license&#39;::text) -&gt; d.license) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS &quot;dct:license&quot;, ((((glossary.dict -&gt; &#39;dataset.confidentiality&#39;::text) -&gt; d.confidentiality) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS &quot;dct:rights&quot;, ((((glossary.dict -&gt; &#39;dataset.publication_frequency&#39;::text) -&gt; d.publication_frequency) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS &quot;dct:accrualPeriodicity&quot;, st_asgeojson(d.geom) AS &quot;dct:spatial&quot;), XMLELEMENT(NAME &quot;dct:created&quot;, XMLATTRIBUTES(&#39;http://www.w3.org/2001/XMLSchema#dateTime&#39; AS &quot;rdf:datatype&quot;), d.creation_date), XMLELEMENT(NAME &quot;dct:issued&quot;, XMLATTRIBUTES(&#39;http://www.w3.org/2001/XMLSchema#dateTime&#39; AS &quot;rdf:datatype&quot;), d.publication_date), XMLELEMENT(NAME &quot;dct:modified&quot;, XMLATTRIBUTES(&#39;http://www.w3.org/2001/XMLSchema#dateTime&#39; AS &quot;rdf:datatype&quot;), d.update_date), ( SELECT xmlagg(XMLCONCAT(XMLELEMENT(NAME &quot;dcat:contactPoint&quot;, XMLELEMENT(NAME &quot;vcard:Organization&quot;, XMLELEMENT(NAME &quot;vcard:fn&quot;, btrim(concat(c.name, &#39; - &#39;, c.organisation_name, ((&#39; (&#39;::text || c.organisation_unit) || &#39;)&#39;::text)))), XMLELEMENT(NAME &quot;vcard:hasEmail&quot;, XMLATTRIBUTES(c.email AS &quot;rdf:resource&quot;), c.email))), XMLELEMENT(NAME &quot;dct:creator&quot;, XMLELEMENT(NAME &quot;foaf:Organization&quot;, XMLELEMENT(NAME &quot;foaf:name&quot;, btrim(concat(c.name, &#39; - &#39;, c.organisation_name, ((&#39; (&#39;::text || c.organisation_unit) || &#39;)&#39;::text)))), XMLELEMENT(NAME &quot;foaf:mbox&quot;, c.email))))) AS xmlagg&#10;           FROM (pgmetadata.contact c&#10;             JOIN pgmetadata.dataset_contact dc ON (((dc.contact_role = &#39;OW&#39;::text) AND (dc.fk_id_dataset = d.id) AND (dc.fk_id_contact = c.id))))), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dct:publisher&quot;, XMLELEMENT(NAME &quot;foaf:Organization&quot;, XMLELEMENT(NAME &quot;foaf:name&quot;, btrim(concat(c.name, &#39; - &#39;, c.organisation_name, ((&#39; (&#39;::text || c.organisation_unit) || &#39;)&#39;::text)))), XMLELEMENT(NAME &quot;foaf:mbox&quot;, c.email)))) AS xmlagg&#10;           FROM (pgmetadata.contact c&#10;             JOIN pgmetadata.dataset_contact dc ON (((dc.contact_role = &#39;DI&#39;::text) AND (dc.fk_id_dataset = d.id) AND (dc.fk_id_contact = c.id))))), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:distribution&quot;, XMLELEMENT(NAME &quot;dcat:Distribution&quot;, XMLFOREST(l.name AS &quot;dct:title&quot;, l.description AS &quot;dct:description&quot;, l.url AS &quot;dcat:downloadURL&quot;, ((((glossary.dict -&gt; &#39;link.mime&#39;::text) -&gt; l.mime) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale) AS &quot;dcat:mediaType&quot;, COALESCE(l.format, ((((glossary.dict -&gt; &#39;link.type&#39;::text) -&gt; l.type) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale)) AS &quot;dct:format&quot;, l.size AS &quot;dct:bytesize&quot;)))) AS xmlagg&#10;           FROM pgmetadata.link l&#10;          WHERE (l.fk_id_dataset = d.id)), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:keyword&quot;, btrim(kw.kw))) AS xmlagg&#10;           FROM unnest(regexp_split_to_array(d.keywords, &#39;,&#39;::text)) kw(kw)), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:theme&quot;, th.label)) AS xmlagg&#10;           FROM pgmetadata.theme th,&#10;            unnest(d.themes) cat(cat)&#10;          WHERE (th.code = cat.cat)), ( SELECT xmlagg(XMLELEMENT(NAME &quot;dcat:theme&quot;, ((((glossary.dict -&gt; &#39;dataset.categories&#39;::text) -&gt; cat.cat) -&gt; &#39;label&#39;::text) -&gt;&gt; glossary.locale))) AS xmlagg&#10;           FROM unnest(d.categories) cat(cat)))) AS dataset&#10;   FROM glossary,&#10;    pgmetadata.dataset d;</textarea>
+                            <div style="padding-top: 5px;"><hr></div>
+                            <div class="box box-solid">
+                                <div class="box-header with-border">
+                                    <i class="fa fa-puzzle-piece"></i>
+                                    <h3 class="box-title">Possibly Referenced Tables/Views</h3>
+                                </div>
+                                <!-- /.box-header -->
+                                <div class="box-body">
+                                    <ul class="list-unstyled">
+                                        <li><a href="glossary.html">glossary</a></li>
+                                        <li><a href="v_glossary.html">v_glossary</a></li>
+                                        <li><a href="contact.html">contact</a></li>
+                                        <li><a href="dataset_contact.html">dataset_contact</a></li>
+                                        <li><a href="link.html">link</a></li>
+                                        <li><a href="theme.html">theme</a></li>
+                                        <li><a href="dataset.html">dataset</a></li>
+                                    </ul>
+                                </div><!-- /.box-body -->
+                            </div>
+                        </div><!-- /.box-body -->
+                    </div>
+                </section>
+                <script>
+                    var config = {
+                        pagination: true
+                    }
+                </script>
+            </div>
+            <!-- /.content-wrapper -->
+            <footer class="main-footer">
+                <div>
+                    <div class="pull-right hidden-xs">
+                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
+                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
+                    </div>
+                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.1.0</a></strong>
+                </div>
+                <!-- /.container -->
+            </footer>
+        </div>
+        <!-- ./wrapper -->
+
+        <!-- jQuery 2.2.3 -->
+        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
+        <!-- Bootstrap 3.3.5 -->
+        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
+        <!-- DataTables -->
+        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
+        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
+        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
+        <!-- SheetJS -->
+        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
+        <!-- pdfmake -->
+        <script src="../bower/pdfmake/pdfmake.min.js"></script>
+        <script src="../bower/pdfmake/vfs_fonts.js"></script>
+        <!-- SlimScroll -->
+        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+        <!-- FastClick -->
+        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
+        <!-- Salvattore -->
+        <script src="../bower/salvattore/salvattore.min.js"></script>
+        <!-- AnchorJS -->
+        <script src="../bower/anchor-js/anchor.min.js"></script>
+        <!-- CodeMirror -->
+        <script src="../bower/codemirror/codemirror.js"></script>
+        <script src="../bower/codemirror/sql.js"></script>
+        <!-- AdminLTE App -->
+        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
+        <script src="table.js"></script>
+        <script src="../schemaSpy.js"></script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/docs/database/tables/v_glossary.html b/docs/database/tables/v_glossary.html
index 100aacd2..14f31956 100644
--- a/docs/database/tables/v_glossary.html
+++ b/docs/database/tables/v_glossary.html
@@ -146,7 +146,7 @@ <h3 id="ViewDefinition" class="box-title">View Definition</h3>
                             </div>
                         </div>
                         <div class="box-body">
-                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH one AS (&#10;         SELECT glossary.field,&#10;            glossary.code,&#10;            json_build_object(&#39;label&#39;, json_build_object(&#39;en&#39;, glossary.label, &#39;fr&#39;, COALESCE(NULLIF(glossary.label_fr, &#39;&#39;::text), glossary.label, &#39;&#39;::text)), &#39;description&#39;, json_build_object(&#39;en&#39;, glossary.description, &#39;fr&#39;, COALESCE(NULLIF(glossary.description_fr, &#39;&#39;::text), glossary.description, &#39;&#39;::text))) AS dict&#10;           FROM pgmetadata.glossary&#10;        ), two AS (&#10;         SELECT one.field,&#10;            json_object_agg(one.code, one.dict) AS dict&#10;           FROM one&#10;          GROUP BY one.field&#10;        )&#10; SELECT json_object_agg(two.field, two.dict) AS dict&#10;   FROM two;</textarea>
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">WITH one AS (&#10;         SELECT glossary.field,&#10;            glossary.code,&#10;            json_build_object(&#39;label&#39;, json_build_object(&#39;en&#39;, glossary.label_en, &#39;fr&#39;, COALESCE(NULLIF(glossary.label_fr, &#39;&#39;::text), glossary.label_en, &#39;&#39;::text), &#39;it&#39;, COALESCE(NULLIF(glossary.label_it, &#39;&#39;::text), glossary.label_en, &#39;&#39;::text), &#39;es&#39;, COALESCE(NULLIF(glossary.label_es, &#39;&#39;::text), glossary.label_en, &#39;&#39;::text), &#39;de&#39;, COALESCE(NULLIF(glossary.label_de, &#39;&#39;::text), glossary.label_en, &#39;&#39;::text)), &#39;description&#39;, json_build_object(&#39;en&#39;, glossary.description_en, &#39;fr&#39;, COALESCE(NULLIF(glossary.description_fr, &#39;&#39;::text), glossary.description_en, &#39;&#39;::text), &#39;it&#39;, COALESCE(NULLIF(glossary.description_it, &#39;&#39;::text), glossary.description_en, &#39;&#39;::text), &#39;es&#39;, COALESCE(NULLIF(glossary.description_es, &#39;&#39;::text), glossary.description_en, &#39;&#39;::text), &#39;de&#39;, COALESCE(NULLIF(glossary.description_de, &#39;&#39;::text), glossary.description_en, &#39;&#39;::text))) AS dict&#10;           FROM pgmetadata.glossary&#10;        ), two AS (&#10;         SELECT one.field,&#10;            json_object_agg(one.code, one.dict) AS dict&#10;           FROM one&#10;          GROUP BY one.field&#10;        )&#10; SELECT json_object_agg(two.field, two.dict) AS dict&#10;   FROM two;</textarea>
                             <div style="padding-top: 5px;"><hr></div>
                             <div class="box box-solid">
                                 <div class="box-header with-border">
diff --git a/docs/database/tables/v_locales.html b/docs/database/tables/v_locales.html
new file mode 100644
index 00000000..d4e296a2
--- /dev/null
+++ b/docs/database/tables/v_locales.html
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>v_locales - gis Database</title>
+        <!-- Tell the browser to be responsive to screen width -->
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
+        <!-- Bootstrap 3.3.5 -->
+        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome -->
+        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
+        <!-- Ionicons -->
+        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
+        <!-- DataTables -->
+        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
+        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
+        <!-- Code Mirror -->
+        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
+        <!-- Fonts -->
+        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
+        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
+
+        <!-- Theme style -->
+        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
+        <!-- Salvattore -->
+        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
+        <!-- AdminLTE Skins. Choose a skin from the css/skins
+           folder instead of downloading all of them to reduce the load. -->
+        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
+        <!-- SchemaSpy -->
+        <link rel="stylesheet" href="../schemaSpy.css">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="../bower/html5shiv/html5shiv.min.js"></script>
+        <script src="../bower/respond/respond.min.js"></script>
+        <![endif]-->
+    </head>
+    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
+    <body class="hold-transition skin-blue layout-top-nav">
+        <div class="wrapper">
+            <header class="main-header">
+                <nav class="navbar navbar-static-top">
+                    <div class="container">
+                        <div class="navbar-header">
+                            <a href="../index.html" class="navbar-brand"><b>gis</b> Database</a>
+                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
+                        </div>
+
+                        <!-- Collect the nav links, forms, and other content for toggling -->
+                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                            <ul class="nav navbar-nav">
+                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
+                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
+                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
+                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
+                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
+                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
+                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
+                            </ul>
+                        </div>
+                        <!-- /.navbar-collapse -->
+                        <!-- Navbar Right Menu -->
+                    </div>
+                    <!-- /.container-fluid -->
+                </nav>
+            </header>
+            <!-- Main content -->
+            <!-- Full Width Column -->
+            <div class="content-wrapper">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1>v_locales</h1><p><span id="recordNumber">0</span> rows</p><br />
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-file-text-o"></i>
+                            <h3 id="Description" class="box-title">Description</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div><!-- /.box-header -->
+                        <div class="box-body clearfix">
+                            <p>Lists the locales available in the glossary, by listing the columns label_xx of the table pgmetadata.glossary</p>
+                        </div><!-- /.box-body -->
+                    </div>
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
+                            <h3 id="Columns" class="box-title">Columns</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <table id="standard_table" class="table table-bordered table-striped dataTable" role="grid">
+                                <thead align='left'>
+                                <tr>
+                                    <th>Column</th>
+                                    <th>Type</th>
+                                    <th>Size</th>
+                                    <th title='Are nulls allowed?'>Nulls</th>
+                                    <th title='Is column automatically updated?'>Auto</th>
+                                    <th title='Default value'>Default</th>
+                                    <th title='Columns in tables that reference this column'>Children</th>
+                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
+                                    <th title='Comments' class="toggle"><span>Comments</span></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td><span id="locale">locale</span></td>
+                                    <td>text</td>
+                                    <td>2147483647</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-file-code-o"></i>
+                            <h3 id="ViewDefinition" class="box-title">View Definition</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">SELECT &#39;en&#39;::text AS locale&#10;UNION&#10; SELECT replace((columns.column_name)::text, &#39;label_&#39;::text, &#39;&#39;::text) AS locale&#10;   FROM information_schema.columns&#10;  WHERE (((columns.table_schema)::text = &#39;pgmetadata&#39;::text) AND ((columns.table_name)::text = &#39;glossary&#39;::text) AND ((columns.column_name)::text ~~ &#39;label_%&#39;::text))&#10;  ORDER BY 1;</textarea>
+                            <div style="padding-top: 5px;"><hr></div>
+                            <div class="box box-solid">
+                                <div class="box-header with-border">
+                                    <i class="fa fa-puzzle-piece"></i>
+                                    <h3 class="box-title">Possibly Referenced Tables/Views</h3>
+                                </div>
+                                <!-- /.box-header -->
+                                <div class="box-body">
+                                    <ul class="list-unstyled">
+                                    </ul>
+                                </div><!-- /.box-body -->
+                            </div>
+                        </div><!-- /.box-body -->
+                    </div>
+                </section>
+                <script>
+                    var config = {
+                        pagination: true
+                    }
+                </script>
+            </div>
+            <!-- /.content-wrapper -->
+            <footer class="main-footer">
+                <div>
+                    <div class="pull-right hidden-xs">
+                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
+                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
+                    </div>
+                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.1.0</a></strong>
+                </div>
+                <!-- /.container -->
+            </footer>
+        </div>
+        <!-- ./wrapper -->
+
+        <!-- jQuery 2.2.3 -->
+        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
+        <!-- Bootstrap 3.3.5 -->
+        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
+        <!-- DataTables -->
+        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
+        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
+        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
+        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
+        <!-- SheetJS -->
+        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
+        <!-- pdfmake -->
+        <script src="../bower/pdfmake/pdfmake.min.js"></script>
+        <script src="../bower/pdfmake/vfs_fonts.js"></script>
+        <!-- SlimScroll -->
+        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+        <!-- FastClick -->
+        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
+        <!-- Salvattore -->
+        <script src="../bower/salvattore/salvattore.min.js"></script>
+        <!-- AnchorJS -->
+        <script src="../bower/anchor-js/anchor.min.js"></script>
+        <!-- CodeMirror -->
+        <script src="../bower/codemirror/codemirror.js"></script>
+        <script src="../bower/codemirror/sql.js"></script>
+        <!-- AdminLTE App -->
+        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
+        <script src="table.js"></script>
+        <script src="../schemaSpy.js"></script>
+    </body>
+</html>
\ No newline at end of file