From 491b86ddd0d2551bb562daf9f4ef52e727a7af1a Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Tue, 27 Apr 2021 08:23:45 +0200
Subject: [PATCH] duplicate -> raw

---
 .../utils/OrganizationStatus.java             |    2 +-
 .../main/resources/sql/importDedupEvents.sql  |    4 +-
 .../resources/static/dbmodel/anomalies.html   |    4 -
 .../resources/static/dbmodel/columns.html     | 3582 ++++++++---------
 .../static/dbmodel/deletionOrder.txt          |    1 -
 .../main/resources/static/dbmodel/index.html  |   17 +-
 .../resources/static/dbmodel/info-html.txt    |    2 +-
 .../static/dbmodel/insertionOrder.txt         |    1 -
 .../dbmodel/oa_organizations.public.xml       |   10 -
 .../resources/static/dbmodel/orphans.html     |    3 -
 .../resources/html/pages/search/browse.html   |    6 +-
 11 files changed, 1750 insertions(+), 1882 deletions(-)

diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/OrganizationStatus.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/OrganizationStatus.java
index 6d23133d..83c14758 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/OrganizationStatus.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/OrganizationStatus.java
@@ -4,5 +4,5 @@ public enum OrganizationStatus {
 	suggested, // from user or dedup depends by created_by field
 	approved,  // normal status of valid organizations
 	hidden,    // hidden organizations after the fix of a conflict
-	duplicate  // organizations that duplicate of a valid organization (their id is not an openorgs id)
+	raw  // raw organizations (their id is not an openorgs id)
 }
diff --git a/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql b/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql
index 46ca44f2..0283f98c 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql
+++ b/apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql
@@ -49,9 +49,9 @@ FROM (
 ) as c 
 ON CONFLICT DO NOTHING;
 
--- NEW ORGANIZATIONS (duplicate)
+-- NEW ORGANIZATIONS (raw)
 INSERT INTO organizations(id, name, country, status, ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, created_by, modified_by) 
-SELECT oa_original_id, oa_name, oa_country, 'duplicate', ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, 'dedupWf', 'dedupWf' 
+SELECT oa_original_id, oa_name, oa_country, 'raw', ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, 'dedupWf', 'dedupWf' 
 FROM tmp_dedup_events 
 WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%'
 ON CONFLICT DO NOTHING;
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html
index 8c0bc4a2..4f9f3de1 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html
@@ -130,10 +130,6 @@
                                                 <td><a href='tables/tmp_dedup_events.html'>tmp_dedup_events</a></td>
                                                 <td>236350</td>
                                             </tr>
-                                            <tr>
-                                                <td><a href='tables/tmp_dedup_events_bak.html'>tmp_dedup_events_bak</a></td>
-                                                <td>223437</td>
-                                            </tr>
                                         </tbody>
                                     </table>
                                 </div>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html
index efb5c050..6ee807c1 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html
@@ -105,11 +105,11 @@
                 <script>
                     var tableData = [
     {
-        "tableName": "organizations_view",
-        "tableType": "View",
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_internationalorganization",
+        "name": "ec_nutscode",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -118,11 +118,284 @@
         "comments": ""
     },
     {
-        "tableName": "journal",
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "local_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_nutscode",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "user_roles",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>role",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "notes",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "operation",
+        "name": "modified_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "city_1",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>oa_original_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "other_ids",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_acronym",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "reltype",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "'suggested'::text",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_researchorganization",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_conflicts",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_smevalidated",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_highereducation",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "last_access",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "languages",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modified_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "notes",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modification_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "urls",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>url",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_conflicts",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id2",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganizationeurinterests",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_highereducation",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -135,6 +408,279 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
+        "name": "ec_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>role",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "'USER'::text",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "urls",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "creation_date",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_acronym",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_researchorganization",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_collectedfrom",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_smevalidated",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_other_ids",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "group_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "type_1",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "country",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_duplicates",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>local_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "journal",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "description",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "lat",
+        "type": "float8",
+        "length": 17,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>type",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "'UNKNOWN'::text",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_enterprise",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "relations",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "relationships",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id1",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "ec_legalbody",
         "type": "bool",
         "length": 1,
@@ -143,11 +689,219 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalbody",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "org_types",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modified_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "urls",
+        "type": "_text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "pid_list",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "lat",
+        "type": "float8",
+        "length": 17,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "type_2",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_original_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
+        "name": "ec_nutscode",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "countries",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "note",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "duplicate_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "name",
         "type": "text",
         "length": 2147483647,
@@ -161,21 +915,8 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_enterprise",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "org_index_search",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>txt",
-        "type": "tsvector",
+        "name": "acronyms",
+        "type": "jsonb",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -183,11 +924,24 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_view",
+        "tableName": "other_names",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_legalperson",
+        "name": "ec_legalbody",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -196,11 +950,89 @@
         "comments": ""
     },
     {
-        "tableName": "conflict_groups_view",
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganization",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name_1",
+        "name": "modified_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "relationships",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>reltype",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "org_types",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganizationeurinterests",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users_view",
+        "tableType": "View",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_collectedfrom",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -222,89 +1054,11 @@
         "comments": ""
     },
     {
-        "tableName": "users",
+        "tableName": "oa_conflicts",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "valid",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "true",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_legalperson",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "relationships",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>reltype",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>local_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "suggestions_info_by_country_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "n_conflicts",
-        "type": "int8",
-        "length": 19,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "journal",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>idgroup",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -317,20 +1071,7 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "creation_date",
-        "type": "timestamptz",
-        "length": 35,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_nutscode",
+        "name": "ec_researchorganization",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -339,11 +1080,76 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_simple_view",
+        "tableName": "other_ids",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "status",
+        "name": "ec_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "first_access",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_url",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "journal",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -365,11 +1171,11 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
+        "tableName": "organizations",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_internationalorganization",
+        "name": "ec_nutscode",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -377,11 +1183,479 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "oa_conflicts",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id1",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "type",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "user_countries",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
+        "name": "ec_highereducation",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "countries",
+        "type": "_text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "countries",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_original_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "suggestions_info_by_country_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_duplicates",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "duplicate_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "city",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "lng",
+        "type": "float8",
+        "length": 17,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "city",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganizationeurinterests",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "suggestions_info_by_country_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_pending_orgs",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users_view",
+        "tableType": "View",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>role",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "other_names",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "city_2",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_conflicts",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "creation_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "id_types",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "country_2",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "id_types",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_country",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalperson",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_smevalidated",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "other_ids",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>type",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "notes",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "note",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "status",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "'suggested'::text",
+        "comments": ""
+    },
+    {
+        "tableName": "user_countries",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "suggestions_info_by_country_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_conflicts",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "idgroup",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "reltype",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id_1",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_researchorganization",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "status",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "oa_country",
         "type": "text",
         "length": 2147483647,
@@ -403,388 +1677,11 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_nonprofit",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_url",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "local_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "org_types",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "status",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "'suggested'::text",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_legalbody",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>idgroup",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "duplicate_groups_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "('openorgs____::'::text || lpad((nextval('organizations_id_seq'::regclass))::text, 10, '0'::text))",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_researchorganization",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "suggestions_info_by_country_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "code",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "created_by",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_internationalorganizationeurinterests",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_internationalorganization",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "created_by",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_legalperson",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "n_conflicts",
-        "type": "int8",
-        "length": 19,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "user_roles",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>role",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "id_types",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "lat",
-        "type": "float8",
-        "length": 17,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_acronym",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_enterprise",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_internationalorganizationeurinterests",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>type",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "'UNKNOWN'::text",
-        "comments": ""
-    },
-    {
-        "tableName": "users_view",
-        "tableType": "View",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_legalbody",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "urls",
-        "type": "_text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "local_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "suggestions_info_by_country_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
         "name": "n_duplicates",
         "type": "int8",
         "length": 19,
@@ -794,47 +1691,8 @@
         "comments": ""
     },
     {
-        "tableName": "organizations",
+        "tableName": "languages",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_smevalidated",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "users_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "first_access",
-        "type": "timestamptz",
-        "length": 35,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
         "name": "name",
@@ -846,167 +1704,11 @@
         "comments": ""
     },
     {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name_2",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_highereducation",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "pid_list",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "idgroup",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "other_names",
+        "tableName": "urls",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "users_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "last_access",
-        "type": "timestamptz",
-        "length": 35,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_smevalidated",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "reltype",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "'suggested'::text",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_smevalidated",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "journal",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "type_1",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "relationships",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id1",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -1027,129 +1729,12 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modified_by",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "group_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "creation_date",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "acronyms",
-        "type": "_text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_original_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "other_names",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>lang",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "other_ids",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "status",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_url",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modified_by",
+        "name": "id",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1162,7 +1747,7 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id_2",
+        "name": "name_1",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1170,155 +1755,12 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_legalbody",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_nutscode",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_country",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_other_ids",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "relations",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_enterprise",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "id_types",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "city",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "city",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "acronyms",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>acronym",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "org_index_search",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "organizations_info_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
+        "name": "created_by",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1326,6 +1768,32 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "duplicate_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modification_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
     {
         "tableName": "journal",
         "tableType": "Table",
@@ -1344,20 +1812,7 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "lng",
-        "type": "float8",
-        "length": 17,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_name",
+        "name": "name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1365,97 +1820,6 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "user_countries",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "urls",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "notes",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modification_date",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_original_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "org_types",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_smevalidated",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_researchorganization",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "oa_duplicates",
         "tableType": "Table",
@@ -1469,77 +1833,25 @@
         "defaultValue": "now()",
         "comments": ""
     },
-    {
-        "tableName": "users_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "valid",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_country",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "journal",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_nonprofit",
-        "type": "bool",
-        "length": 1,
+        "name": "oa_url",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "relationships",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id2",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
+        "tableName": "organizations_simple_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "created_by",
+        "name": "type",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1548,155 +1860,12 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_info_view",
+        "tableName": "organizations_simple_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "modification_date",
-        "type": "timestamptz",
-        "length": 35,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "lat",
-        "type": "float8",
-        "length": 17,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "other_ids",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>type",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modification_date",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modification_date",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_nutscode",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_nutscode",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "type_2",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_legalperson",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "users",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>role",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "'USER'::text",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modified_by",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_original_id",
-        "type": "text",
+        "name": "acronyms",
+        "type": "_text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -1708,46 +1877,20 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "lng",
-        "type": "float8",
-        "length": 17,
+        "name": "ec_internationalorganization",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "users",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "first_access",
-        "type": "timestamptz",
-        "length": 35,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>oa_original_id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
+        "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "country_1",
+        "name": "oa_name",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1755,19 +1898,6 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "acronyms",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "tmp_dedup_events",
         "tableType": "Table",
@@ -1782,89 +1912,24 @@
         "comments": ""
     },
     {
-        "tableName": "tmp_dedup_events_bak",
+        "tableName": "org_index_search",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "group_id",
-        "type": "text",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>txt",
+        "type": "tsvector",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "reltype",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "city_1",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "notes",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "note",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "suggestions_info_by_country_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "n_pending_orgs",
-        "type": "int8",
-        "length": 19,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "countries",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "organizations",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_researchorganization",
+        "name": "ec_legalbody",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -1877,7 +1942,7 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_url",
+        "name": "local_id",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1886,8 +1951,8 @@
         "comments": ""
     },
     {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
         "name": "ec_internationalorganization",
@@ -1898,266 +1963,6 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "created_by",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "other_names",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_researchorganization",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "urls",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "other_names",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "type",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "users",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id2",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "languages",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "country_2",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_highereducation",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "duplicate_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "n_duplicates",
-        "type": "int8",
-        "length": 19,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "city_2",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "urls",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>url",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id1",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "id_1",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_internationalorganizationeurinterests",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "user_countries",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "note",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "journal",
         "tableType": "Table",
@@ -2176,7 +1981,33 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_nonprofit",
+        "name": "lng",
+        "type": "float8",
+        "length": 17,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_collectedfrom",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_enterprise",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2189,47 +2020,8 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_acronym",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "users",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "last_access",
-        "type": "timestamptz",
-        "length": 35,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "country",
-        "type": "text",
+        "name": "other_names",
+        "type": "jsonb",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -2241,7 +2033,20 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "created_by",
+        "name": "reltype",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "'suggested'::text",
+        "comments": ""
+    },
+    {
+        "tableName": "journal",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "operation",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2250,11 +2055,11 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "type",
+        "tableName": "journal",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2263,11 +2068,11 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_view",
+        "tableName": "users_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_internationalorganizationeurinterests",
+        "name": "valid",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2276,37 +2081,11 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_collectedfrom",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
+        "tableName": "conflict_groups_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "other_ids",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "notes",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modified_by",
+        "name": "name_2",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2315,37 +2094,11 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_info_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events_bak",
+        "tableName": "tmp_dedup_events",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_collectedfrom",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_nonprofit",
+        "name": "ec_legalperson",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2353,32 +2106,6 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_highereducation",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "modified_by",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
     {
         "tableName": "organizations",
         "tableType": "Table",
@@ -2397,20 +2124,85 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "org_index_search",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "relationships",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id2",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "creation_date",
         "type": "timestamptz",
         "length": 35,
         "nullable": "√",
         "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalperson",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "organizations_view",
+        "tableName": "users",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "valid",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "true",
+        "comments": ""
+    },
+    {
+        "tableName": "suggestions_info_by_country_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "country",
+        "name": "code",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2419,13 +2211,26 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_info_view",
+        "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "n_duplicates",
-        "type": "int8",
-        "length": 19,
+        "name": "city",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "country_1",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -2445,37 +2250,11 @@
         "comments": ""
     },
     {
-        "tableName": "languages",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>val",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates",
+        "tableName": "oa_conflicts",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "reltype",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "'suggested'::text",
-        "comments": ""
-    },
-    {
-        "tableName": "countries",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name",
+        "name": "modified_by",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2484,11 +2263,24 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
+        "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_collectedfrom",
+        "name": "ec_smevalidated",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "status",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2497,12 +2289,38 @@
         "comments": ""
     },
     {
-        "tableName": "users_view",
+        "tableName": "organizations_info_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "countries",
-        "type": "_text",
+        "name": "modification_date",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "city",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id_2",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -2523,11 +2341,50 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "('openorgs____::'::text || lpad((nextval('organizations_id_seq'::regclass))::text, 10, '0'::text))",
+        "comments": ""
+    },
+    {
+        "tableName": "acronyms",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>acronym",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "local_id",
+        "name": "first_access",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2536,24 +2393,37 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
+        "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_acronym",
-        "type": "text",
-        "length": 2147483647,
+        "name": "ec_internationalorganization",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "duplicate_groups_view",
+        "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "city",
+        "name": "ec_legalperson",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "country",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2564,11 +2434,24 @@
     {
         "tableName": "users_view",
         "tableType": "View",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>role",
-        "type": "text",
-        "length": 2147483647,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "last_access",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_enterprise",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -2579,35 +2462,48 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_collectedfrom",
-        "type": "text",
-        "length": 2147483647,
+        "name": "ec_internationalorganizationeurinterests",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "organizations",
+        "tableName": "oa_conflicts",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "city",
+        "name": "modification_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "other_names",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>lang",
         "type": "text",
         "length": 2147483647,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "duplicate_groups_view",
+        "tableName": "organizations_info_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "id",
-        "type": "text",
-        "length": 2147483647,
+        "name": "n_conflicts",
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/deletionOrder.txt b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/deletionOrder.txt
index 5e322910..27e34681 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/deletionOrder.txt
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/deletionOrder.txt
@@ -1,4 +1,3 @@
-tmp_dedup_events_bak
 tmp_dedup_events
 org_index_search
 user_countries
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html
index 22589d78..a03501d1 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html
@@ -78,7 +78,7 @@
                         <div class="col-md-12">
                             <div class="callout callout-info">
                                 <h4>SchemaSpy Analysis of oa_organizations</h4>
-                                <p>Generated on lun apr 26 11:10 CEST 2021</p>
+                                <p>Generated on mar apr 27 08:22 CEST 2021</p>
                             </div>
                         </div>
                     </div>
@@ -94,7 +94,7 @@
                                 <span class="info-box-icon bg-aqua"><i class="fa fa-table"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">TABLES</span>
-                                    <span class="info-box-number">20</span>
+                                    <span class="info-box-number">19</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -118,7 +118,7 @@
                                 <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">193</span>
+                                    <span class="info-box-number">185</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -142,7 +142,7 @@
                                 <span class="info-box-icon bg-red-active"><i class="fa fa-question" aria-hidden="true"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">Anomalies</span>
-                                    <span class="info-box-number">6</span>
+                                    <span class="info-box-number">5</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -316,15 +316,6 @@
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/tmp_dedup_events_bak.html">tmp_dedup_events_bak</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">223437</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"></td>
-                                    </tr>
                                     <tr class="tbl even" valign="top">
                                         <td class="detail"><a href="tables/relationships.html">relationships</a></td>
                                         <td class="detail" align="right">0</td>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt
index 14d2181c..53ffed89 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt
@@ -1,4 +1,4 @@
-date=2021-04-26 11:10:28+0200
+date=2021-04-27 08:22:28+0200
 os=Mac OS X 11.2.3
 schemaspy-version=6.1.0
 schemaspy-build=6.1.0.41 2019-09-17 21:52:57
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/insertionOrder.txt b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/insertionOrder.txt
index 250815ea..a31e0cc0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/insertionOrder.txt
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/insertionOrder.txt
@@ -17,4 +17,3 @@ relationships
 user_countries
 org_index_search
 tmp_dedup_events
-tmp_dedup_events_bak
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml
index a07fbc0f..4d0080ff 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml
@@ -385,16 +385,6 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="17" name="oa_url" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="18" name="pid_list" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
       </table>
-      <table name="tmp_dedup_events_bak" numRows="223437" remarks="" schema="public" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="group_id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="local_id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="oa_acronym" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="oa_collectedfrom" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="oa_country" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="oa_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="oa_original_id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="oa_url" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
-      </table>
       <table name="urls" numRows="216098" remarks="" schema="public" type="TABLE">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="id" nullable="false" remarks="" size="2147483647" type="text" typeCode="12">
             <parent column="id" foreignKey="urls_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="organizations"/>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/orphans.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/orphans.html
index 0551584f..1166a7fb 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/orphans.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/orphans.html
@@ -87,9 +87,6 @@
                                 <div class="item">
                                     <object type="image/svg+xml" id="org_index_searchDegreeImg" data="diagrams/orphans/org_index_search.1degree.svg" style="max-width:100%;" border="0" align="top"></object>
                                 </div>
-                                <div class="item">
-                                    <object type="image/svg+xml" id="tmp_dedup_events_bakDegreeImg" data="diagrams/orphans/tmp_dedup_events_bak.1degree.svg" style="max-width:100%;" border="0" align="top"></object>
-                                </div>
                                 <div class="item">
                                     <object type="image/svg+xml" id="tmp_dedup_eventsDegreeImg" data="diagrams/orphans/tmp_dedup_events.1degree.svg" style="max-width:100%;" border="0" align="top"></object>
                                 </div>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/browse.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/browse.html
index c6ddf8b7..25677167 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/browse.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/browse.html
@@ -15,7 +15,7 @@
 			<th class="text-right text-nowrap col-4" ng-if="mode == 0" title="valid organizations">#</th>
 			<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="valid organizations"># approved</th>
 			<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="to be approved by an administrator"># suggested</th>
-			<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="duplicates(not openorgs) of a valid organization"># duplicate</th>
+			<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="raw organizations (not openorgs)"># raw</th>
 			<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="organizations hidden by the system (for example fixing a conflict)"># hidden</th>
 		</tr>
 	</thead>
@@ -31,8 +31,8 @@
 				<span ng-if="!e.values.suggested || e.values.suggested == 0">-</span>
 			</td>
 			<td class="text-right" ng-if="mode == 1">
-				<a href="#!{{resultsBasePath}}/0/50/duplicate/{{e.code}}" ng-if="e.values.duplicate && e.values.duplicate > 0">{{e.values.duplicate}}</a>
-				<span ng-if="!e.values.duplicate || e.values.duplicate == 0">-</span>
+				<a href="#!{{resultsBasePath}}/0/50/raw/{{e.code}}" ng-if="e.values.raw && e.values.raw > 0">{{e.values.raw}}</a>
+				<span ng-if="!e.values.raw || e.values.raw == 0">-</span>
 			</td>
 			<td class="text-right" ng-if="mode == 1">
 				<a href="#!{{resultsBasePath}}/0/50/hidden/{{e.code}}" ng-if="e.values.hidden && e.values.hidden > 0">{{e.values.hidden}}</a>