diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java
index 34094f14..7e24b9d0 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java
@@ -3,6 +3,7 @@ package eu.dnetlib.organizations;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 import eu.dnetlib.common.app.AbstractDnetApp;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -14,6 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @EnableSwagger2
 @EnableCaching
+@EnableScheduling
 public class MainApplication extends AbstractDnetApp {
 
 	public static void main(final String[] args) {
diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java
index 37ad4ae0..671c99e5 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java
@@ -54,6 +54,8 @@ import eu.dnetlib.organizations.utils.OrganizationStatus;
 @RequestMapping("/api/organizations")
 public class OrganizationController extends AbstractDnetController {
 
+	private static final String SPECIAL_STATUS_FOR_CANDIDATE_DUP = "candidate_dup";
+
 	@Autowired
 	private OrganizationViewRepository organizationViewRepository;
 	@Autowired
@@ -223,19 +225,24 @@ public class OrganizationController extends AbstractDnetController {
 		@RequestParam(required = false, defaultValue = "") final String status,
 		final Authentication authentication) {
 
-		final List<String> statuses;
-
-		if (StringUtils.isNotBlank(status)) {
-			statuses = Arrays.asList(status.split(","));
-		} else if (UserInfo.isSimpleUser(authentication)) {
-			statuses = Arrays.asList(OrganizationStatus.approved.toString());
+		if (status.equals(SPECIAL_STATUS_FOR_CANDIDATE_DUP)) {
+			return UserInfo.isSuperAdmin(authentication)
+				? organizationSimpleViewRepository.searchCandidateDuplicates(q, PageRequest.of(page, size))
+				: organizationSimpleViewRepository.searchCandidateDuplicatesForUser(q, UserInfo.getEmail(authentication), PageRequest.of(page, size));
 		} else {
-			statuses = Arrays.asList(OrganizationStatus.approved.toString(), OrganizationStatus.suggested.toString());
-		}
+			final List<String> statuses;
+			if (StringUtils.isNotBlank(status)) {
+				statuses = Arrays.asList(status.split(","));
+			} else if (UserInfo.isSimpleUser(authentication)) {
+				statuses = Arrays.asList(OrganizationStatus.approved.toString());
+			} else {
+				statuses = Arrays.asList(OrganizationStatus.approved.toString(), OrganizationStatus.suggested.toString());
+			}
 
-		return UserInfo.isSuperAdmin(authentication)
-			? organizationSimpleViewRepository.search(q, statuses, PageRequest.of(page, size))
-			: organizationSimpleViewRepository.searchForUser(q, UserInfo.getEmail(authentication), statuses, PageRequest.of(page, size));
+			return UserInfo.isSuperAdmin(authentication)
+				? organizationSimpleViewRepository.search(q, statuses, PageRequest.of(page, size))
+				: organizationSimpleViewRepository.searchForUser(q, UserInfo.getEmail(authentication), statuses, PageRequest.of(page, size));
+		}
 	}
 
 	@GetMapping("/byCountry/{status}/{code}/{page}/{size}")
diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java
index e30a32df..3c58f49e 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java
@@ -53,23 +53,24 @@ public class OrganizationSimpleView implements Serializable, Comparable<Organiza
 	@Column(name = "status")
 	private String status;
 
+	@Column(name = "n_similar_dups")
+	private Long nSimilarDups;
+
+	@Column(name = "n_suggested_dups")
+	private Long nSuggestedDups;
+
+	@Column(name = "n_different_dups")
+	private Long nDifferentDups;
+
+	@Column(name = "candidate_dup")
+	private Boolean candidateDup;
+
 	public OrganizationSimpleView() {}
 
 	public OrganizationSimpleView(final String id) {
 		this.id = id;
 	}
 
-	public OrganizationSimpleView(final String id, final String name, final String type, final String city, final String country, final String[] acronyms,
-		final String status) {
-		this.id = id;
-		this.name = name;
-		this.type = type;
-		this.city = city;
-		this.country = country;
-		this.acronyms = acronyms;
-		this.status = status;
-	}
-
 	public String getId() {
 		return id;
 	}
@@ -134,6 +135,38 @@ public class OrganizationSimpleView implements Serializable, Comparable<Organiza
 		this.urls = urls;
 	}
 
+	public Long getnSimilarDups() {
+		return nSimilarDups;
+	}
+
+	public void setnSimilarDups(final Long nSimilarDups) {
+		this.nSimilarDups = nSimilarDups;
+	}
+
+	public Long getnSuggestedDups() {
+		return nSuggestedDups;
+	}
+
+	public void setnSuggestedDups(final Long nSuggestedDups) {
+		this.nSuggestedDups = nSuggestedDups;
+	}
+
+	public Long getnDifferentDups() {
+		return nDifferentDups;
+	}
+
+	public void setnDifferentDups(final Long nDifferentDups) {
+		this.nDifferentDups = nDifferentDups;
+	}
+
+	public Boolean getCandidateDup() {
+		return candidateDup;
+	}
+
+	public void setCandidateDup(final Boolean candidateDup) {
+		this.candidateDup = candidateDup;
+	}
+
 	@Override
 	public int hashCode() {
 		return Objects.hash(id);
diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java
index 6920a666..ee5fdc7d 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java
@@ -42,4 +42,12 @@ public interface OrganizationSimpleViewRepository extends ReadOnlyRepository<Org
 	@Query(value = "select o.* from organizations_simple_view o left outer join user_countries uc on (uc.country = o.country) where o.type = ?1 and o.status = ?2 and uc.email = ?3 order by o.name", nativeQuery = true)
 	Page<OrganizationSimpleView> findByTypeAndStatusForUser(String type, String status, String name, Pageable pageable);
 
+	// SEARCH FOR VALID DUPLICATE CANDIDATES
+	@Query(value = "select o.* from organizations_simple_view o left outer join org_index_search idx on (idx.id = o.id) where idx.txt @@ plainto_tsquery(:text) and o.candidate_dup order by o.name", nativeQuery = true)
+	Page<OrganizationSimpleView> searchCandidateDuplicates(@Param("text") String text, Pageable pageable);
+
+	// SEARCH FOR VALID DUPLICATE CANDIDATES FOR USER
+	@Query(value = "select o.* from organizations_simple_view o left outer join org_index_search idx on (idx.id = o.id) left outer join user_countries uc on (uc.country = o.country) where idx.txt @@ plainto_tsquery(:text) and uc.email = :email and o.candidate_dup order by o.name", nativeQuery = true)
+	Page<OrganizationSimpleView> searchCandidateDuplicatesForUser(@Param("text") String text, @Param("email") String email, Pageable pageable);
+
 }
diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
index ff9872f4..93aa35b2 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
@@ -1,6 +1,7 @@
 package eu.dnetlib.organizations.utils;
 
 import java.time.OffsetDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -210,32 +212,63 @@ public class DatabaseUtils {
 	public void saveDuplicates(final List<OpenaireDuplicate> simrels, final String user) {
 		final OffsetDateTime now = OffsetDateTime.now();
 
-		final List<OpenaireDuplicate> list = openaireDuplicateRepository.saveAll(simrels.stream()
-			.filter(d -> !d.getOaOriginalId().startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX))
-			.collect(Collectors.toList()));
+		// Set is_different all the existing relations that refer to the new duplicates (suggested or is_similar)
 
-		simrels.stream()
-			.map(OpenaireDuplicate::getOaOriginalId)
-			.filter(id -> id.startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX))
-			.distinct()
-			.forEach(organizationRepository::deleteById);
+		final List<OpenaireDuplicate> toSave = new ArrayList<>();
+		toSave.addAll(simrels);
 
-		list.forEach(d -> {
+		final List<OpenaireDuplicate> toDelete = new ArrayList<>();
+
+		for (final OpenaireDuplicate r1 : simrels) {
+			if (!r1.getRelType().equals(SimilarityType.is_different.toString())) {
+				for (final OpenaireDuplicate r2 : openaireDuplicateRepository.findByOaOriginalId(r1.getOaOriginalId())) {
+					if (r2.getLocalId().startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX)) {
+						toDelete.add(r2);
+					} else if (!r1.getLocalId().equals(r2.getLocalId())) {
+						toSave.add(r2);
+					}
+				}
+			}
+		}
+
+		// Save the new rels
+		openaireDuplicateRepository.saveAll(toSave).forEach(d -> {
 			openaireDuplicateRepository.updateCreatedByIfMissing(d.getLocalId(), d.getOaOriginalId(), user);
 			openaireDuplicateRepository.updateModificationDate(d.getLocalId(), d.getOaOriginalId(), user, now);
 		});
+		log.info("Simrels saved (contains also the fixed rels): " + toSave.size());
 
-		final String message = String.format("Duplicates updated (%s similars, %s differents, %s suggested)", list.stream()
+		// delete rels to pending orgs
+		openaireDuplicateRepository.deleteAll(toDelete);
+		log.info("Simrels related to a pending orgs deleted: " + toDelete.size());
+
+		final String message = String.format("Duplicates updated (%s similars, %s differents, %s suggested)", simrels.stream()
 			.filter(d -> d.getRelType().equals(SimilarityType.is_similar.toString()))
-			.count(), list.stream()
+			.count(), simrels.stream()
 				.filter(d -> d.getRelType().equals(SimilarityType.is_different.toString()))
-				.count(), list.stream().filter(d -> d.getRelType().equals(SimilarityType.suggested.toString())).count());
+				.count(), simrels.stream().filter(d -> d.getRelType().equals(SimilarityType.suggested.toString())).count());
 
-		list.stream()
+		simrels.stream()
 			.map(OpenaireDuplicate::getLocalId)
 			.distinct()
 			.map(id -> new JournalEntry(id, JournalOperations.DUPLICATES, message, user))
 			.forEach(journalEntryRepository::save);
+	}
+
+	@Scheduled(fixedRate = 300000)
+	public void verifyConsistency() {
+
+		log.info("Verify consistency (START)");
+
+		// delete invalid pending orgs (without simrels)
+		final int n = jdbcTemplate
+			.update("delete from organizations where id in (select o.id from organizations o left outer join oa_duplicates d on (o.id = d.local_id) where o.status = 'suggested' and o.created_by = 'dedupWf' group by o.id having count(d.local_id) = 0)");
+
+		if (n > 0) {
+			log.info("Invalid pending orgs deleted: " + n);
+		}
+
+		log.info("Verify consistency (END)");
 
 	}
 
diff --git a/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql b/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql
index 0836892e..c152e037 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql
+++ b/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql
@@ -559,11 +559,17 @@ CREATE VIEW organizations_simple_view AS SELECT
 	org.country,
 	org.status,
 	array_remove(array_agg(DISTINCT a.acronym), NULL) AS acronyms,
-	array_remove(array_agg(DISTINCT u.url), NULL) AS urls
+	array_remove(array_agg(DISTINCT u.url), NULL) AS urls,
+	count(DISTINCT d1.oa_original_id) FILTER (WHERE d1.reltype = 'is_similar'  ) AS n_similar_dups,
+	count(DISTINCT d1.oa_original_id) FILTER (WHERE d1.reltype = 'suggested'   ) AS n_suggested_dups,
+	count(DISTINCT d1.oa_original_id) FILTER (WHERE d1.reltype = 'is_different') AS n_different_dups,
+	(org.status = 'raw' AND not('is_similar' = ANY(array_agg(d2.reltype))))      AS candidate_dup
 FROM
     organizations org
     LEFT OUTER JOIN acronyms a ON (org.id = a.id)
     LEFT OUTER JOIN urls u ON (org.id = u.id)
+    LEFT OUTER JOIN oa_duplicates d1 ON (org.id = d1.local_id)
+    LEFT OUTER JOIN oa_duplicates d2 ON (org.id = d2.oa_original_id)
 GROUP BY
     org.id,
     org.name,
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 4f9f3de1..159c5e10 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
@@ -128,7 +128,7 @@
                                         <tbody>
                                             <tr>
                                                 <td><a href='tables/tmp_dedup_events.html'>tmp_dedup_events</a></td>
-                                                <td>236350</td>
+                                                <td>236394</td>
                                             </tr>
                                         </tbody>
                                     </table>
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 6ee807c1..2dc103b9 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
@@ -109,20 +109,7 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_nutscode",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "local_id",
+        "name": "oa_country",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -130,318 +117,6 @@
         "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": "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": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "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",
@@ -456,63 +131,11 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
+        "tableName": "organizations_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",
+        "name": "other_names",
         "type": "jsonb",
         "length": 2147483647,
         "nullable": "√",
@@ -521,63 +144,11 @@
         "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",
+        "tableName": "relationships",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>local_id",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id2",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -585,32 +156,6 @@
         "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",
@@ -624,11 +169,180 @@
         "defaultValue": "'UNKNOWN'::text",
         "comments": ""
     },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "status",
+        "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": "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": "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_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "notes",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "note",
+        "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_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "other_ids",
+        "type": "jsonb",
+        "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>type",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modification_date",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_researchorganization",
+        "type": "bool",
+        "length": 1,
+        "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": "organizations",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
+        "name": "ec_highereducation",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "ec_enterprise",
         "type": "bool",
         "length": 1,
@@ -637,6 +351,45 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "acronyms",
+        "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": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganizationeurinterests",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "organizations_simple_view",
         "tableType": "View",
@@ -651,206 +404,11 @@
         "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,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
+        "tableName": "journal",
         "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",
+        "name": "description",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -872,11 +430,50 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_info_view",
+        "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "note",
+        "name": "oa_url",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "type",
+        "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_nutscode",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -884,25 +481,77 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "notes",
+        "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": "country",
+        "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>email",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "tmp_dedup_events",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_nonprofit",
-        "type": "bool",
-        "length": 1,
+        "name": "oa_url",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "duplicate_groups_view",
+        "tableName": "conflict_groups_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
+        "name": "name_1",
+        "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": "√",
@@ -915,8 +564,21 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "acronyms",
-        "type": "jsonb",
+        "name": "ec_nutscode",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -924,11 +586,11 @@
         "comments": ""
     },
     {
-        "tableName": "other_names",
+        "tableName": "org_index_search",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>name",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -941,19 +603,6 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_legalbody",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
         "name": "ec_internationalorganization",
         "type": "bool",
         "length": 1,
@@ -963,10 +612,23 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_info_view",
+        "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
+        "name": "city",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "modified_by",
         "type": "text",
         "length": 2147483647,
@@ -976,24 +638,11 @@
         "comments": ""
     },
     {
-        "tableName": "relationships",
+        "tableName": "other_names",
         "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",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>lang",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -1006,22 +655,9 @@
         "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,
+        "name": "lng",
+        "type": "float8",
+        "length": 17,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -1032,7 +668,7 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_collectedfrom",
+        "name": "local_id",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1040,6 +676,110 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_similar_dups",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "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": "",
+        "keyTitle": "",
+        "name": "modified_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "duplicate_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "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": "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": "oa_conflicts",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "creation_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_conflicts",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "organizations",
         "tableType": "Table",
@@ -1054,24 +794,11 @@
         "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": "organizations",
-        "tableType": "Table",
+        "tableName": "organizations_view",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_researchorganization",
+        "name": "ec_internationalorganizationeurinterests",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -1080,11 +807,24 @@
         "comments": ""
     },
     {
-        "tableName": "other_ids",
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_enterprise",
+        "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>id",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>reltype",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -1093,11 +833,37 @@
         "comments": ""
     },
     {
-        "tableName": "organizations",
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "journal",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>jid",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('journal_jid_seq'::regclass)",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "created_by",
+        "name": "oa_collectedfrom",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1110,7 +876,7 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_nonprofit",
+        "name": "ec_smevalidated",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -1136,46 +902,46 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_url",
-        "type": "text",
-        "length": 2147483647,
+        "name": "ec_smevalidated",
+        "type": "bool",
+        "length": 1,
         "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": "acronyms",
-        "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": "ec_nutscode",
+        "name": "city",
+        "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": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalperson",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -1183,12 +949,38 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "reltype",
+        "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": "other_names",
+        "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": "",
@@ -1196,6 +988,45 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "candidate_dup",
+        "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": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganizationeurinterests",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "organizations_view",
         "tableType": "View",
@@ -1210,11 +1041,24 @@
         "comments": ""
     },
     {
-        "tableName": "user_countries",
+        "tableName": "urls",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id",
+        "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": "",
@@ -1227,7 +1071,33 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_highereducation",
+        "name": "oa_collectedfrom",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "journal",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "op_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_nonprofit",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -1236,39 +1106,13 @@
         "comments": ""
     },
     {
-        "tableName": "users_view",
+        "tableName": "duplicate_groups_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,
+        "name": "n_duplicates",
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -1287,164 +1131,21 @@
         "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,
+        "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": "now()",
+        "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "id_types",
+        "tableName": "languages",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
@@ -1470,63 +1171,11 @@
         "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",
+        "tableName": "oa_duplicates",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>type",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>oa_original_id",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -1534,38 +1183,12 @@
         "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",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
         "type": "text",
         "length": 2147483647,
         "nullable": "",
@@ -1578,7 +1201,7 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "n_conflicts",
+        "name": "n_pending_orgs",
         "type": "int8",
         "length": 19,
         "nullable": "√",
@@ -1587,179 +1210,10 @@
         "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",
+        "tableName": "oa_conflicts",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_country",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "duplicate_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "country",
-        "type": "text",
-        "length": 2147483647,
-        "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": "languages",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name",
-        "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": "other_ids",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>otherid",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "id",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "conflict_groups_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "name_1",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
         "name": "created_by",
         "type": "text",
         "length": 2147483647,
@@ -1782,29 +1236,68 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
+        "tableName": "suggestions_info_by_country_view",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "modification_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "code",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "last_access",
+        "type": "timestamptz",
+        "length": 35,
+        "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_conflicts",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "reltype",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "'suggested'::text",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_conflicts",
+        "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>jid",
-        "type": "serial",
-        "length": 10,
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>id2",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('journal_jid_seq'::regclass)",
+        "autoUpdated": "",
+        "defaultValue": "null",
         "comments": ""
     },
     {
@@ -1812,61 +1305,9 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "creation_date",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_duplicates_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "oa_url",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "type",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_simple_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "acronyms",
-        "type": "_text",
-        "length": 2147483647,
+        "name": "lat",
+        "type": "float8",
+        "length": 17,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -1877,47 +1318,47 @@
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_internationalorganization",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
+        "name": "status",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
+        "defaultValue": "'suggested'::text",
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
+        "tableName": "suggestions_info_by_country_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "oa_name",
-        "type": "text",
-        "length": 2147483647,
+        "name": "n_conflicts",
+        "type": "int8",
+        "length": 19,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_enterprise",
-        "type": "bool",
-        "length": 1,
+        "name": "n_different_dups",
+        "type": "int8",
+        "length": 19,
         "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",
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name_2",
+        "type": "text",
         "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
@@ -1938,11 +1379,11 @@
         "comments": ""
     },
     {
-        "tableName": "tmp_dedup_events",
-        "tableType": "Table",
+        "tableName": "organizations_view",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "local_id",
+        "name": "status",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -1951,11 +1392,11 @@
         "comments": ""
     },
     {
-        "tableName": "oa_duplicates_view",
+        "tableName": "users_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_internationalorganization",
+        "name": "valid",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -1964,16 +1405,81 @@
         "comments": ""
     },
     {
-        "tableName": "journal",
+        "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": "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": "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_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_researchorganization",
+        "type": "bool",
+        "length": 1,
+        "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": "users",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "op_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "valid",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
+        "defaultValue": "true",
         "comments": ""
     },
     {
@@ -1989,25 +1495,12 @@
         "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",
+        "name": "ec_smevalidated",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2016,13 +1509,143 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_view",
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_original_id",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "other_names",
-        "type": "jsonb",
+        "name": "n_duplicates",
+        "type": "int8",
+        "length": 19,
+        "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>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",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganization",
+        "type": "bool",
+        "length": 1,
+        "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": "oa_duplicates_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": "city",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "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_nonprofit",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalbody",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -2031,14 +1654,40 @@
     {
         "tableName": "oa_conflicts",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "reltype",
+        "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": "'suggested'::text",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "users_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "countries",
+        "type": "_text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "creation_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
         "comments": ""
     },
     {
@@ -2068,141 +1717,11 @@
         "comments": ""
     },
     {
-        "tableName": "users_view",
+        "tableName": "oa_duplicates_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "valid",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "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_legalperson",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "ec_highereducation",
-        "type": "bool",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
-        "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": "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": "code",
+        "name": "oa_country",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2215,7 +1734,20 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "city",
+        "name": "ec_legalperson",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "oa_acronym",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2228,7 +1760,7 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "country_1",
+        "name": "type_2",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2237,23 +1769,10 @@
         "comments": ""
     },
     {
-        "tableName": "suggestions_info_by_country_view",
+        "tableName": "organizations_info_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "name",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
         "name": "modified_by",
         "type": "text",
         "length": 2147483647,
@@ -2262,12 +1781,25 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "notes",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modification_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
     {
         "tableName": "organizations_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_smevalidated",
+        "name": "ec_highereducation",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2275,84 +1807,6 @@
         "defaultValue": "null",
         "comments": ""
     },
-    {
-        "tableName": "organizations_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "status",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "organizations_info_view",
-        "tableType": "View",
-        "keyClass": "",
-        "keyTitle": "",
-        "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": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "notes",
-        "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": "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",
@@ -2367,24 +1821,24 @@
         "comments": ""
     },
     {
-        "tableName": "users_view",
+        "tableName": "organizations_simple_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "first_access",
-        "type": "timestamptz",
-        "length": 35,
+        "name": "urls",
+        "type": "_text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "organizations",
+        "tableName": "notes",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modified_by",
         "type": "text",
         "length": 2147483647,
         "nullable": "√",
@@ -2392,6 +1846,32 @@
         "defaultValue": "null",
         "comments": ""
     },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "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",
@@ -2406,11 +1886,24 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_view",
-        "tableType": "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": "tmp_dedup_events",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_legalperson",
+        "name": "ec_nutscode",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2419,7 +1912,150 @@
         "comments": ""
     },
     {
-        "tableName": "organizations_view",
+        "tableName": "oa_duplicates",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "modified_by",
+        "type": "text",
+        "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": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "pid_list",
+        "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": "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",
+        "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": "languages",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "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": "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_acronym",
+        "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": "organizations_simple_view",
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
@@ -2432,13 +2068,78 @@
         "comments": ""
     },
     {
-        "tableName": "users_view",
+        "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": "last_access",
-        "type": "timestamptz",
-        "length": 35,
+        "name": "urls",
+        "type": "jsonb",
+        "length": 2147483647,
+        "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": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_simple_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "n_suggested_dups",
+        "type": "int8",
+        "length": 19,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_researchorganization",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "idgroup",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -2449,7 +2150,267 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "ec_enterprise",
+        "name": "ec_nutscode",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_smevalidated",
+        "type": "bool",
+        "length": 1,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "suggestions_info_by_country_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "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_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "relations",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_info_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "organizations_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalbody",
+        "type": "bool",
+        "length": 1,
+        "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": "other_ids",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>otherid",
+        "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_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "acronyms",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id_2",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_internationalorganization",
+        "type": "bool",
+        "length": 1,
+        "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_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "id",
+        "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": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "created_by",
+        "type": "text",
+        "length": 2147483647,
+        "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_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "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": "organizations",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_legalperson",
         "type": "bool",
         "length": 1,
         "nullable": "√",
@@ -2471,27 +2432,40 @@
         "comments": ""
     },
     {
-        "tableName": "oa_conflicts",
-        "tableType": "Table",
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "modification_date",
-        "type": "timestamp",
-        "length": 29,
+        "name": "ec_highereducation",
+        "type": "bool",
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
+        "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": "",
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "ec_enterprise",
+        "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": ""
@@ -2501,9 +2475,87 @@
         "tableType": "View",
         "keyClass": "",
         "keyTitle": "",
-        "name": "n_conflicts",
-        "type": "int8",
-        "length": 19,
+        "name": "name",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "oa_duplicates_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "local_id",
+        "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": "tmp_dedup_events",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "group_id",
+        "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": "users",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "last_access",
+        "type": "timestamptz",
+        "length": 35,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "conflict_groups_view",
+        "tableType": "View",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "city_2",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot
index 01c448cc..ae793575 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot
@@ -22,7 +22,7 @@ digraph "org_index_search" {
       <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>org_index_search</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="txt" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">txt</TD></TR></TABLE></TD><TD PORT="txt.type" ALIGN="LEFT">tsvector[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.619 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.675 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/org_index_search.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg
index 08658f83..b88cc7ab 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg
@@ -33,7 +33,7 @@
 <text text-anchor="start" x="13" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 0</text>
 <polygon fill="#ffffff" stroke="transparent" points="46,-6 46,-25 133,-25 133,-6 46,-6"/>
 <polygon fill="none" stroke="#000000" points="46,-6 46,-25 133,-25 133,-6 46,-6"/>
-<text text-anchor="start" x="63.9791" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.619 rows</text>
+<text text-anchor="start" x="63.9791" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.675 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="133,-6 133,-25 244,-25 244,-6 133,-6"/>
 <polygon fill="none" stroke="#000000" points="133,-6 133,-25 244,-25 244,-6 133,-6"/>
 <text text-anchor="start" x="225.4053" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot
index ab11d4b0..9ec3b4e4 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot
@@ -39,7 +39,7 @@ digraph "tmp_dedup_events" {
       <TR><TD PORT="oa_original_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD><TD PORT="oa_original_id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="oa_url" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">oa_url</TD></TR></TABLE></TD><TD PORT="oa_url.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="pid_list" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">pid_list</TD></TR></TABLE></TD><TD PORT="pid_list.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">236.350 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">236.394 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/tmp_dedup_events.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg
index ab377a24..1b3964e4 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg
@@ -99,7 +99,7 @@
 <text text-anchor="start" x="13.5" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 0</text>
 <polygon fill="#ffffff" stroke="transparent" points="111.5,-6 111.5,-25 263.5,-25 263.5,-6 111.5,-6"/>
 <polygon fill="none" stroke="#000000" points="111.5,-6 111.5,-25 263.5,-25 263.5,-6 111.5,-6"/>
-<text text-anchor="start" x="194.4791" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">236.350 rows</text>
+<text text-anchor="start" x="194.4791" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">236.394 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="263.5,-6 263.5,-25 353.5,-25 353.5,-6 263.5,-6"/>
 <polygon fill="none" stroke="#000000" points="263.5,-6 263.5,-25 353.5,-25 353.5,-6 263.5,-6"/>
 <text text-anchor="start" x="334.9053" y="-12.1" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot
index 6922b4aa..e8b81b24 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot
@@ -24,7 +24,7 @@ digraph "compactImpliedRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -62,7 +62,7 @@ digraph "compactImpliedRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -113,7 +113,7 @@ digraph "compactImpliedRelationshipsDiagram" {
       <TR><TD PORT="local_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">local_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="oa_original_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -139,7 +139,7 @@ digraph "compactImpliedRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -152,7 +152,7 @@ digraph "compactImpliedRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -190,7 +190,7 @@ digraph "compactImpliedRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg
index e47aedb6..1da30187 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="465.2027" y="-918.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-912.2 483.5,-931.2 555.5,-931.2 555.5,-912.2 483.5,-912.2"/>
 <polygon fill="none" stroke="#000000" points="483.5,-912.2 483.5,-931.2 555.5,-931.2 555.5,-912.2 483.5,-912.2"/>
-<text text-anchor="start" x="486.4896" y="-918.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="486.4896" y="-918.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="555.5,-912.2 555.5,-931.2 567.5,-931.2 567.5,-912.2 555.5,-912.2"/>
 <polygon fill="none" stroke="#000000" points="555.5,-912.2 555.5,-931.2 567.5,-931.2 567.5,-912.2 555.5,-912.2"/>
 <text text-anchor="start" x="558.4431" y="-918.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -64,7 +64,7 @@
 <text text-anchor="start" x="154.5" y="-769.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="238.5,-763.2 238.5,-782.2 343.5,-782.2 343.5,-763.2 238.5,-763.2"/>
 <polygon fill="none" stroke="#000000" points="238.5,-763.2 238.5,-782.2 343.5,-782.2 343.5,-763.2 238.5,-763.2"/>
-<text text-anchor="start" x="274.4791" y="-769.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="274.4791" y="-769.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="343.5,-763.2 343.5,-782.2 404.5,-782.2 404.5,-763.2 343.5,-763.2"/>
 <polygon fill="none" stroke="#000000" points="343.5,-763.2 343.5,-782.2 404.5,-782.2 404.5,-763.2 343.5,-763.2"/>
 <text text-anchor="start" x="379.7904" y="-769.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -156,7 +156,7 @@
 <text text-anchor="start" x="475.5" y="-258.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="494.5,-252.2 494.5,-271.2 544.5,-271.2 544.5,-252.2 494.5,-252.2"/>
 <polygon fill="none" stroke="#000000" points="494.5,-252.2 494.5,-271.2 544.5,-271.2 544.5,-252.2 494.5,-252.2"/>
-<text text-anchor="start" x="497.1904" y="-258.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="497.1904" y="-258.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="544.5,-252.2 544.5,-271.2 557.5,-271.2 557.5,-252.2 544.5,-252.2"/>
 <polygon fill="none" stroke="#000000" points="544.5,-252.2 544.5,-271.2 557.5,-271.2 557.5,-252.2 544.5,-252.2"/>
 <text text-anchor="start" x="548.3862" y="-258.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -334,7 +334,7 @@
 <text text-anchor="start" x="456.5" y="-1261.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-1255.2 483.5,-1274.2 559.5,-1274.2 559.5,-1255.2 483.5,-1255.2"/>
 <polygon fill="none" stroke="#000000" points="483.5,-1255.2 483.5,-1274.2 559.5,-1274.2 559.5,-1255.2 483.5,-1255.2"/>
-<text text-anchor="start" x="490.4791" y="-1261.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="490.4791" y="-1261.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="559.5,-1255.2 559.5,-1274.2 576.5,-1274.2 576.5,-1255.2 559.5,-1255.2"/>
 <polygon fill="none" stroke="#000000" points="559.5,-1255.2 559.5,-1274.2 576.5,-1274.2 576.5,-1255.2 559.5,-1255.2"/>
 <text text-anchor="start" x="567.3862" y="-1261.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -418,7 +418,7 @@
 <text text-anchor="start" x="465.2027" y="-536.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-530.2 483.5,-549.2 555.5,-549.2 555.5,-530.2 483.5,-530.2"/>
 <polygon fill="none" stroke="#000000" points="483.5,-530.2 483.5,-549.2 555.5,-549.2 555.5,-530.2 483.5,-530.2"/>
-<text text-anchor="start" x="486.4896" y="-536.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="486.4896" y="-536.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="555.5,-530.2 555.5,-549.2 567.5,-549.2 567.5,-530.2 555.5,-530.2"/>
 <polygon fill="none" stroke="#000000" points="555.5,-530.2 555.5,-549.2 567.5,-549.2 567.5,-530.2 555.5,-530.2"/>
 <text text-anchor="start" x="558.4431" y="-536.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -547,7 +547,7 @@
 <text text-anchor="start" x="465.2027" y="-1025.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-1019.2 483.5,-1038.2 555.5,-1038.2 555.5,-1019.2 483.5,-1019.2"/>
 <polygon fill="none" stroke="#000000" points="483.5,-1019.2 483.5,-1038.2 555.5,-1038.2 555.5,-1019.2 483.5,-1019.2"/>
-<text text-anchor="start" x="486.4896" y="-1025.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="486.4896" y="-1025.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="555.5,-1019.2 555.5,-1038.2 567.5,-1038.2 567.5,-1019.2 555.5,-1019.2"/>
 <polygon fill="none" stroke="#000000" points="555.5,-1019.2 555.5,-1038.2 567.5,-1038.2 567.5,-1019.2 555.5,-1019.2"/>
 <text text-anchor="start" x="558.4431" y="-1025.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot
index d363147b..299a6d7c 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot
@@ -24,7 +24,7 @@ digraph "largeImpliedRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -64,7 +64,7 @@ digraph "largeImpliedRelationshipsDiagram" {
       <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="op_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">op_date</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -126,7 +126,7 @@ digraph "largeImpliedRelationshipsDiagram" {
       <TR><TD PORT="modification_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modification_date</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="modified_by" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modified_by</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="created_by" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">created_by</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -170,7 +170,7 @@ digraph "largeImpliedRelationshipsDiagram" {
       <TR><TD PORT="ec_enterprise" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_enterprise</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="ec_smevalidated" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_smevalidated</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="ec_nutscode" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_nutscode</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -183,7 +183,7 @@ digraph "largeImpliedRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -221,7 +221,7 @@ digraph "largeImpliedRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg
index cda63894..bd19b544 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="465.2027" y="-1170.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-1164.7 483.5,-1183.7 555.5,-1183.7 555.5,-1164.7 483.5,-1164.7"/>
 <polygon fill="none" stroke="#000000" points="483.5,-1164.7 483.5,-1183.7 555.5,-1183.7 555.5,-1164.7 483.5,-1164.7"/>
-<text text-anchor="start" x="486.4896" y="-1170.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="486.4896" y="-1170.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="555.5,-1164.7 555.5,-1183.7 567.5,-1183.7 567.5,-1164.7 555.5,-1164.7"/>
 <polygon fill="none" stroke="#000000" points="555.5,-1164.7 555.5,-1183.7 567.5,-1183.7 567.5,-1164.7 555.5,-1164.7"/>
 <text text-anchor="start" x="558.4431" y="-1170.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -100,7 +100,7 @@
 <text text-anchor="start" x="154.5" y="-722.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="238.5,-716.7 238.5,-735.7 343.5,-735.7 343.5,-716.7 238.5,-716.7"/>
 <polygon fill="none" stroke="#000000" points="238.5,-716.7 238.5,-735.7 343.5,-735.7 343.5,-716.7 238.5,-716.7"/>
-<text text-anchor="start" x="274.4791" y="-722.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="274.4791" y="-722.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="343.5,-716.7 343.5,-735.7 404.5,-735.7 404.5,-716.7 343.5,-716.7"/>
 <polygon fill="none" stroke="#000000" points="343.5,-716.7 343.5,-735.7 404.5,-735.7 404.5,-716.7 343.5,-716.7"/>
 <text text-anchor="start" x="379.7904" y="-722.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -196,7 +196,7 @@
 <text text-anchor="start" x="475.5" y="-327.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="494.5,-321.7 494.5,-340.7 544.5,-340.7 544.5,-321.7 494.5,-321.7"/>
 <polygon fill="none" stroke="#000000" points="494.5,-321.7 494.5,-340.7 544.5,-340.7 544.5,-321.7 494.5,-321.7"/>
-<text text-anchor="start" x="497.1904" y="-327.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="497.1904" y="-327.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="544.5,-321.7 544.5,-340.7 557.5,-340.7 557.5,-321.7 544.5,-321.7"/>
 <polygon fill="none" stroke="#000000" points="544.5,-321.7 544.5,-340.7 557.5,-340.7 557.5,-321.7 544.5,-321.7"/>
 <text text-anchor="start" x="548.3862" y="-327.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -400,7 +400,7 @@
 <text text-anchor="start" x="456.5" y="-1513.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-1507.7 483.5,-1526.7 559.5,-1526.7 559.5,-1507.7 483.5,-1507.7"/>
 <polygon fill="none" stroke="#000000" points="483.5,-1507.7 483.5,-1526.7 559.5,-1526.7 559.5,-1507.7 483.5,-1507.7"/>
-<text text-anchor="start" x="490.4791" y="-1513.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="490.4791" y="-1513.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="559.5,-1507.7 559.5,-1526.7 576.5,-1526.7 576.5,-1507.7 559.5,-1507.7"/>
 <polygon fill="none" stroke="#000000" points="559.5,-1507.7 559.5,-1526.7 576.5,-1526.7 576.5,-1507.7 559.5,-1507.7"/>
 <text text-anchor="start" x="567.3862" y="-1513.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -484,7 +484,7 @@
 <text text-anchor="start" x="465.2027" y="-651.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-645.7 483.5,-664.7 555.5,-664.7 555.5,-645.7 483.5,-645.7"/>
 <polygon fill="none" stroke="#000000" points="483.5,-645.7 483.5,-664.7 555.5,-664.7 555.5,-645.7 483.5,-645.7"/>
-<text text-anchor="start" x="486.4896" y="-651.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="486.4896" y="-651.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="555.5,-645.7 555.5,-664.7 567.5,-664.7 567.5,-645.7 555.5,-645.7"/>
 <polygon fill="none" stroke="#000000" points="555.5,-645.7 555.5,-664.7 567.5,-664.7 567.5,-645.7 555.5,-645.7"/>
 <text text-anchor="start" x="558.4431" y="-651.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -613,7 +613,7 @@
 <text text-anchor="start" x="465.2027" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-1271.7 483.5,-1290.7 555.5,-1290.7 555.5,-1271.7 483.5,-1271.7"/>
 <polygon fill="none" stroke="#000000" points="483.5,-1271.7 483.5,-1290.7 555.5,-1290.7 555.5,-1271.7 483.5,-1271.7"/>
-<text text-anchor="start" x="486.4896" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="486.4896" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="555.5,-1271.7 555.5,-1290.7 567.5,-1290.7 567.5,-1271.7 555.5,-1271.7"/>
 <polygon fill="none" stroke="#000000" points="555.5,-1271.7 555.5,-1290.7 567.5,-1290.7 567.5,-1271.7 555.5,-1271.7"/>
 <text text-anchor="start" x="558.4431" y="-1277.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot
index 4e2228db..d4a6287c 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot
@@ -24,7 +24,7 @@ digraph "compactRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -61,7 +61,7 @@ digraph "compactRelationshipsDiagram" {
       <TR><TD PORT="jid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">jid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -112,7 +112,7 @@ digraph "compactRelationshipsDiagram" {
       <TR><TD PORT="local_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">local_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="oa_original_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -138,7 +138,7 @@ digraph "compactRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -151,7 +151,7 @@ digraph "compactRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -189,7 +189,7 @@ digraph "compactRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg
index d6945fa1..7b5515bc 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="605.2026" y="-320.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-314.7 623.5,-333.7 695.5,-333.7 695.5,-314.7 623.5,-314.7"/>
 <polygon fill="none" stroke="#000000" points="623.5,-314.7 623.5,-333.7 695.5,-333.7 695.5,-314.7 623.5,-314.7"/>
-<text text-anchor="start" x="626.4896" y="-320.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="626.4896" y="-320.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="695.5,-314.7 695.5,-333.7 707.5,-333.7 707.5,-314.7 695.5,-314.7"/>
 <polygon fill="none" stroke="#000000" points="695.5,-314.7 695.5,-333.7 707.5,-333.7 707.5,-314.7 695.5,-314.7"/>
 <text text-anchor="start" x="698.4431" y="-320.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -64,7 +64,7 @@
 <text text-anchor="start" x="294.5" y="-567.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="378.5,-561.7 378.5,-580.7 483.5,-580.7 483.5,-561.7 378.5,-561.7"/>
 <polygon fill="none" stroke="#000000" points="378.5,-561.7 378.5,-580.7 483.5,-580.7 483.5,-561.7 378.5,-561.7"/>
-<text text-anchor="start" x="414.4791" y="-567.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="414.4791" y="-567.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-561.7 483.5,-580.7 544.5,-580.7 544.5,-561.7 483.5,-561.7"/>
 <polygon fill="none" stroke="#000000" points="483.5,-561.7 483.5,-580.7 544.5,-580.7 544.5,-561.7 483.5,-561.7"/>
 <text text-anchor="start" x="519.7904" y="-567.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -153,7 +153,7 @@
 <text text-anchor="start" x="615.5" y="-1041.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="634.5,-1035.7 634.5,-1054.7 684.5,-1054.7 684.5,-1035.7 634.5,-1035.7"/>
 <polygon fill="none" stroke="#000000" points="634.5,-1035.7 634.5,-1054.7 684.5,-1054.7 684.5,-1035.7 634.5,-1035.7"/>
-<text text-anchor="start" x="637.1904" y="-1041.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="637.1904" y="-1041.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="684.5,-1035.7 684.5,-1054.7 697.5,-1054.7 697.5,-1035.7 684.5,-1035.7"/>
 <polygon fill="none" stroke="#000000" points="684.5,-1035.7 684.5,-1054.7 697.5,-1054.7 697.5,-1035.7 684.5,-1035.7"/>
 <text text-anchor="start" x="688.3862" y="-1041.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -295,7 +295,7 @@
 <text text-anchor="start" x="596.5" y="-663.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-657.7 623.5,-676.7 699.5,-676.7 699.5,-657.7 623.5,-657.7"/>
 <polygon fill="none" stroke="#000000" points="623.5,-657.7 623.5,-676.7 699.5,-676.7 699.5,-657.7 623.5,-657.7"/>
-<text text-anchor="start" x="630.4791" y="-663.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="630.4791" y="-663.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="699.5,-657.7 699.5,-676.7 716.5,-676.7 716.5,-657.7 699.5,-657.7"/>
 <polygon fill="none" stroke="#000000" points="699.5,-657.7 699.5,-676.7 716.5,-676.7 716.5,-657.7 699.5,-657.7"/>
 <text text-anchor="start" x="707.3862" y="-663.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -379,7 +379,7 @@
 <text text-anchor="start" x="605.2026" y="-191.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-185.7 623.5,-204.7 695.5,-204.7 695.5,-185.7 623.5,-185.7"/>
 <polygon fill="none" stroke="#000000" points="623.5,-185.7 623.5,-204.7 695.5,-204.7 695.5,-185.7 623.5,-185.7"/>
-<text text-anchor="start" x="626.4896" y="-191.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="626.4896" y="-191.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="695.5,-185.7 695.5,-204.7 707.5,-204.7 707.5,-185.7 695.5,-185.7"/>
 <polygon fill="none" stroke="#000000" points="695.5,-185.7 695.5,-204.7 707.5,-204.7 707.5,-185.7 695.5,-185.7"/>
 <text text-anchor="start" x="698.4431" y="-191.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -508,7 +508,7 @@
 <text text-anchor="start" x="605.2026" y="-427.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-421.7 623.5,-440.7 695.5,-440.7 695.5,-421.7 623.5,-421.7"/>
 <polygon fill="none" stroke="#000000" points="623.5,-421.7 623.5,-440.7 695.5,-440.7 695.5,-421.7 623.5,-421.7"/>
-<text text-anchor="start" x="626.4896" y="-427.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="626.4896" y="-427.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="695.5,-421.7 695.5,-440.7 707.5,-440.7 707.5,-421.7 695.5,-421.7"/>
 <polygon fill="none" stroke="#000000" points="695.5,-421.7 695.5,-440.7 707.5,-440.7 707.5,-421.7 695.5,-421.7"/>
 <text text-anchor="start" x="698.4431" y="-427.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot
index 4b709811..f0bb230d 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot
@@ -24,7 +24,7 @@ digraph "largeRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -64,7 +64,7 @@ digraph "largeRelationshipsDiagram" {
       <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="op_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">op_date</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -126,7 +126,7 @@ digraph "largeRelationshipsDiagram" {
       <TR><TD PORT="modification_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modification_date</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="modified_by" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modified_by</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="created_by" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">created_by</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -170,7 +170,7 @@ digraph "largeRelationshipsDiagram" {
       <TR><TD PORT="ec_enterprise" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_enterprise</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="ec_smevalidated" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_smevalidated</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="ec_nutscode" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_nutscode</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -183,7 +183,7 @@ digraph "largeRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -221,7 +221,7 @@ digraph "largeRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg
index 7baf0048..15a718a0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="605.2026" y="-324.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-318.2 623.5,-337.2 695.5,-337.2 695.5,-318.2 623.5,-318.2"/>
 <polygon fill="none" stroke="#000000" points="623.5,-318.2 623.5,-337.2 695.5,-337.2 695.5,-318.2 623.5,-318.2"/>
-<text text-anchor="start" x="626.4896" y="-324.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="626.4896" y="-324.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="695.5,-318.2 695.5,-337.2 707.5,-337.2 707.5,-318.2 695.5,-318.2"/>
 <polygon fill="none" stroke="#000000" points="695.5,-318.2 695.5,-337.2 707.5,-337.2 707.5,-318.2 695.5,-318.2"/>
 <text text-anchor="start" x="698.4431" y="-324.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -100,7 +100,7 @@
 <text text-anchor="start" x="294.5" y="-308.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="378.5,-302.2 378.5,-321.2 483.5,-321.2 483.5,-302.2 378.5,-302.2"/>
 <polygon fill="none" stroke="#000000" points="378.5,-302.2 378.5,-321.2 483.5,-321.2 483.5,-302.2 378.5,-302.2"/>
-<text text-anchor="start" x="414.4791" y="-308.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="414.4791" y="-308.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-302.2 483.5,-321.2 544.5,-321.2 544.5,-302.2 483.5,-302.2"/>
 <polygon fill="none" stroke="#000000" points="483.5,-302.2 483.5,-321.2 544.5,-321.2 544.5,-302.2 483.5,-302.2"/>
 <text text-anchor="start" x="519.7904" y="-308.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -195,7 +195,7 @@
 <text text-anchor="start" x="615.5" y="-1296.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="634.5,-1290.2 634.5,-1309.2 684.5,-1309.2 684.5,-1290.2 634.5,-1290.2"/>
 <polygon fill="none" stroke="#000000" points="634.5,-1290.2 634.5,-1309.2 684.5,-1309.2 684.5,-1290.2 634.5,-1290.2"/>
-<text text-anchor="start" x="637.1904" y="-1296.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="637.1904" y="-1296.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="684.5,-1290.2 684.5,-1309.2 697.5,-1309.2 697.5,-1290.2 684.5,-1290.2"/>
 <polygon fill="none" stroke="#000000" points="684.5,-1290.2 684.5,-1309.2 697.5,-1309.2 697.5,-1290.2 684.5,-1290.2"/>
 <text text-anchor="start" x="688.3862" y="-1296.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -359,7 +359,7 @@
 <text text-anchor="start" x="596.5" y="-667.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-661.2 623.5,-680.2 699.5,-680.2 699.5,-661.2 623.5,-661.2"/>
 <polygon fill="none" stroke="#000000" points="623.5,-661.2 623.5,-680.2 699.5,-680.2 699.5,-661.2 623.5,-661.2"/>
-<text text-anchor="start" x="630.4791" y="-667.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="630.4791" y="-667.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="699.5,-661.2 699.5,-680.2 716.5,-680.2 716.5,-661.2 699.5,-661.2"/>
 <polygon fill="none" stroke="#000000" points="699.5,-661.2 699.5,-680.2 716.5,-680.2 716.5,-661.2 699.5,-661.2"/>
 <text text-anchor="start" x="707.3862" y="-667.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -443,7 +443,7 @@
 <text text-anchor="start" x="605.2026" y="-195.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-189.2 623.5,-208.2 695.5,-208.2 695.5,-189.2 623.5,-189.2"/>
 <polygon fill="none" stroke="#000000" points="623.5,-189.2 623.5,-208.2 695.5,-208.2 695.5,-189.2 623.5,-189.2"/>
-<text text-anchor="start" x="626.4896" y="-195.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="626.4896" y="-195.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="695.5,-189.2 695.5,-208.2 707.5,-208.2 707.5,-189.2 695.5,-189.2"/>
 <polygon fill="none" stroke="#000000" points="695.5,-189.2 695.5,-208.2 707.5,-208.2 707.5,-189.2 695.5,-189.2"/>
 <text text-anchor="start" x="698.4431" y="-195.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -572,7 +572,7 @@
 <text text-anchor="start" x="605.2026" y="-431.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="623.5,-425.2 623.5,-444.2 695.5,-444.2 695.5,-425.2 623.5,-425.2"/>
 <polygon fill="none" stroke="#000000" points="623.5,-425.2 623.5,-444.2 695.5,-444.2 695.5,-425.2 623.5,-425.2"/>
-<text text-anchor="start" x="626.4896" y="-431.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="626.4896" y="-431.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="695.5,-425.2 695.5,-444.2 707.5,-444.2 707.5,-425.2 695.5,-425.2"/>
 <polygon fill="none" stroke="#000000" points="695.5,-425.2 695.5,-444.2 707.5,-444.2 707.5,-425.2 695.5,-425.2"/>
 <text text-anchor="start" x="698.4431" y="-431.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot
index 63644c91..d76e58d7 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot
@@ -25,7 +25,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="acronym" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD><TD PORT="acronym.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -39,7 +39,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg
index 5bb45647..0b7d3578 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg
@@ -34,7 +34,7 @@
 <text text-anchor="start" x="315.2027" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="333.5,-78.7 333.5,-97.7 405.5,-97.7 405.5,-78.7 333.5,-78.7"/>
 <polygon fill="none" stroke="#000000" points="333.5,-78.7 333.5,-97.7 405.5,-97.7 405.5,-78.7 333.5,-78.7"/>
-<text text-anchor="start" x="336.4896" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="336.4896" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="405.5,-78.7 405.5,-97.7 495.5,-97.7 495.5,-78.7 405.5,-78.7"/>
 <polygon fill="none" stroke="#000000" points="405.5,-78.7 405.5,-97.7 495.5,-97.7 495.5,-78.7 405.5,-78.7"/>
 <text text-anchor="start" x="476.9053" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -69,7 +69,7 @@
 <text text-anchor="start" x="11.5" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-37.7 95.5,-56.7 200.5,-56.7 200.5,-37.7 95.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="95.5,-37.7 95.5,-56.7 200.5,-56.7 200.5,-37.7 95.5,-37.7"/>
-<text text-anchor="start" x="131.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-37.7 200.5,-56.7 261.5,-56.7 261.5,-37.7 200.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="200.5,-37.7 200.5,-56.7 261.5,-56.7 261.5,-37.7 200.5,-37.7"/>
 <text text-anchor="start" x="236.7904" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot
index e4a2c054..756e3f16 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot
@@ -38,7 +38,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="acronym" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD><TD PORT="acronym.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -60,7 +60,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -93,7 +93,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -118,7 +118,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -129,7 +129,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -162,7 +162,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg
index f8741e24..8ce0fa06 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg
@@ -34,7 +34,7 @@
 <text text-anchor="start" x="455.2027" y="-702.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="473.5,-696.7 473.5,-715.7 545.5,-715.7 545.5,-696.7 473.5,-696.7"/>
 <polygon fill="none" stroke="#000000" points="473.5,-696.7 473.5,-715.7 545.5,-715.7 545.5,-696.7 473.5,-696.7"/>
-<text text-anchor="start" x="476.4896" y="-702.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="476.4896" y="-702.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="545.5,-696.7 545.5,-715.7 635.5,-715.7 635.5,-696.7 545.5,-696.7"/>
 <polygon fill="none" stroke="#000000" points="545.5,-696.7 545.5,-715.7 635.5,-715.7 635.5,-696.7 545.5,-696.7"/>
 <text text-anchor="start" x="616.9053" y="-702.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -69,7 +69,7 @@
 <text text-anchor="start" x="151.5" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
-<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <text text-anchor="start" x="376.7904" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -159,7 +159,7 @@
 <text text-anchor="start" x="505.2027" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="523.5,-611.7 523.5,-630.7 573.5,-630.7 573.5,-611.7 523.5,-611.7"/>
 <polygon fill="none" stroke="#000000" points="523.5,-611.7 523.5,-630.7 573.5,-630.7 573.5,-611.7 523.5,-611.7"/>
-<text text-anchor="start" x="526.1904" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="526.1904" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="573.5,-611.7 573.5,-630.7 585.5,-630.7 585.5,-611.7 573.5,-611.7"/>
 <polygon fill="none" stroke="#000000" points="573.5,-611.7 573.5,-630.7 585.5,-630.7 585.5,-611.7 573.5,-611.7"/>
 <text text-anchor="start" x="576.4431" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -257,7 +257,7 @@
 <text text-anchor="start" x="491.5" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="511.5,-365.7 511.5,-384.7 584.5,-384.7 584.5,-365.7 511.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="511.5,-365.7 511.5,-384.7 584.5,-384.7 584.5,-365.7 511.5,-365.7"/>
-<text text-anchor="start" x="515.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="515.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-365.7 584.5,-384.7 598.5,-384.7 598.5,-365.7 584.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="584.5,-365.7 584.5,-384.7 598.5,-384.7 598.5,-365.7 584.5,-365.7"/>
 <text text-anchor="start" x="589.3862" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -294,7 +294,7 @@
 <text text-anchor="start" x="494.2027" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-283.7 512.5,-302.7 584.5,-302.7 584.5,-283.7 512.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="512.5,-283.7 512.5,-302.7 584.5,-302.7 584.5,-283.7 512.5,-283.7"/>
-<text text-anchor="start" x="515.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="515.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-283.7 584.5,-302.7 596.5,-302.7 596.5,-283.7 584.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="584.5,-283.7 584.5,-302.7 596.5,-302.7 596.5,-283.7 584.5,-283.7"/>
 <text text-anchor="start" x="587.4431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -391,7 +391,7 @@
 <text text-anchor="start" x="494.2027" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-37.7 512.5,-56.7 584.5,-56.7 584.5,-37.7 512.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="512.5,-37.7 512.5,-56.7 584.5,-56.7 584.5,-37.7 512.5,-37.7"/>
-<text text-anchor="start" x="515.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="515.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-37.7 584.5,-56.7 596.5,-56.7 596.5,-37.7 584.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="584.5,-37.7 584.5,-56.7 596.5,-56.7 596.5,-37.7 584.5,-37.7"/>
 <text text-anchor="start" x="587.4431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot
index d2e63ee9..5d82c855 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot
@@ -40,7 +40,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg
index e034eabf..1f622980 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg
@@ -37,7 +37,7 @@
 <text text-anchor="start" x="229.5" y="-151.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="313.5,-145.2 313.5,-164.2 418.5,-164.2 418.5,-145.2 313.5,-145.2"/>
 <polygon fill="none" stroke="#000000" points="313.5,-145.2 313.5,-164.2 418.5,-164.2 418.5,-145.2 313.5,-145.2"/>
-<text text-anchor="start" x="349.4791" y="-151.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="349.4791" y="-151.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="418.5,-145.2 418.5,-164.2 479.5,-164.2 479.5,-145.2 418.5,-145.2"/>
 <polygon fill="none" stroke="#000000" points="418.5,-145.2 418.5,-164.2 479.5,-164.2 479.5,-145.2 418.5,-145.2"/>
 <text text-anchor="start" x="454.7904" y="-151.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot
index b6c6e6d0..df91e034 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot
@@ -39,7 +39,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -62,7 +62,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -95,7 +95,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -120,7 +120,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -131,7 +131,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -164,7 +164,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg
index ce9dff41..42929069 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="533.7026" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="552,-693.7 552,-712.7 624,-712.7 624,-693.7 552,-693.7"/>
 <polygon fill="none" stroke="#000000" points="552,-693.7 552,-712.7 624,-712.7 624,-693.7 552,-693.7"/>
-<text text-anchor="start" x="554.9896" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="554.9896" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="624,-693.7 624,-712.7 636,-712.7 636,-693.7 624,-693.7"/>
 <polygon fill="none" stroke="#000000" points="624,-693.7 624,-712.7 636,-712.7 636,-693.7 624,-693.7"/>
 <text text-anchor="start" x="626.9431" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="229.5" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="313.5,-300.7 313.5,-319.7 418.5,-319.7 418.5,-300.7 313.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="313.5,-300.7 313.5,-319.7 418.5,-319.7 418.5,-300.7 313.5,-300.7"/>
-<text text-anchor="start" x="349.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="349.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="418.5,-300.7 418.5,-319.7 479.5,-319.7 479.5,-300.7 418.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="418.5,-300.7 418.5,-319.7 479.5,-319.7 479.5,-300.7 418.5,-300.7"/>
 <text text-anchor="start" x="454.7904" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -158,7 +158,7 @@
 <text text-anchor="start" x="544.7026" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="563,-611.7 563,-630.7 613,-630.7 613,-611.7 563,-611.7"/>
 <polygon fill="none" stroke="#000000" points="563,-611.7 563,-630.7 613,-630.7 613,-611.7 563,-611.7"/>
-<text text-anchor="start" x="565.6904" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="565.6904" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="613,-611.7 613,-630.7 625,-630.7 625,-611.7 613,-611.7"/>
 <polygon fill="none" stroke="#000000" points="613,-611.7 613,-630.7 625,-630.7 625,-611.7 613,-611.7"/>
 <text text-anchor="start" x="615.9431" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -256,7 +256,7 @@
 <text text-anchor="start" x="531" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="551,-365.7 551,-384.7 624,-384.7 624,-365.7 551,-365.7"/>
 <polygon fill="none" stroke="#000000" points="551,-365.7 551,-384.7 624,-384.7 624,-365.7 551,-365.7"/>
-<text text-anchor="start" x="554.9791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="554.9791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="624,-365.7 624,-384.7 638,-384.7 638,-365.7 624,-365.7"/>
 <polygon fill="none" stroke="#000000" points="624,-365.7 624,-384.7 638,-384.7 638,-365.7 624,-365.7"/>
 <text text-anchor="start" x="628.8862" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -293,7 +293,7 @@
 <text text-anchor="start" x="533.7026" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="552,-283.7 552,-302.7 624,-302.7 624,-283.7 552,-283.7"/>
 <polygon fill="none" stroke="#000000" points="552,-283.7 552,-302.7 624,-302.7 624,-283.7 552,-283.7"/>
-<text text-anchor="start" x="554.9896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="554.9896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="624,-283.7 624,-302.7 636,-302.7 636,-283.7 624,-283.7"/>
 <polygon fill="none" stroke="#000000" points="624,-283.7 624,-302.7 636,-302.7 636,-283.7 624,-283.7"/>
 <text text-anchor="start" x="626.9431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -390,7 +390,7 @@
 <text text-anchor="start" x="533.7026" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="552,-37.7 552,-56.7 624,-56.7 624,-37.7 552,-37.7"/>
 <polygon fill="none" stroke="#000000" points="552,-37.7 552,-56.7 624,-56.7 624,-37.7 552,-37.7"/>
-<text text-anchor="start" x="554.9896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="554.9896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="624,-37.7 624,-56.7 636,-56.7 636,-37.7 624,-37.7"/>
 <polygon fill="none" stroke="#000000" points="624,-37.7 624,-56.7 636,-56.7 636,-37.7 624,-37.7"/>
 <text text-anchor="start" x="626.9431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot
index 6e5a629c..63e0e0d0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot
@@ -38,7 +38,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg
index 2153b6d0..e3dd271f 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg
@@ -33,7 +33,7 @@
 <text text-anchor="start" x="223.2027" y="-68.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="241.5,-62.2 241.5,-81.2 313.5,-81.2 313.5,-62.2 241.5,-62.2"/>
 <polygon fill="none" stroke="#000000" points="241.5,-62.2 241.5,-81.2 313.5,-81.2 313.5,-62.2 241.5,-62.2"/>
-<text text-anchor="start" x="244.4896" y="-68.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="244.4896" y="-68.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="313.5,-62.2 313.5,-81.2 325.5,-81.2 325.5,-62.2 313.5,-62.2"/>
 <polygon fill="none" stroke="#000000" points="313.5,-62.2 313.5,-81.2 325.5,-81.2 325.5,-62.2 313.5,-62.2"/>
 <text text-anchor="start" x="316.4431" y="-68.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot
index c6ebba62..e84f32a0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>organizations</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -50,7 +50,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg
index c8c3055f..3d308987 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg
@@ -33,7 +33,7 @@
 <text text-anchor="start" x="223.2027" y="-88.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="241.5,-82.2 241.5,-101.2 313.5,-101.2 313.5,-82.2 241.5,-82.2"/>
 <polygon fill="none" stroke="#000000" points="241.5,-82.2 241.5,-101.2 313.5,-101.2 313.5,-82.2 241.5,-82.2"/>
-<text text-anchor="start" x="244.4896" y="-88.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="244.4896" y="-88.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="313.5,-82.2 313.5,-101.2 325.5,-101.2 325.5,-82.2 313.5,-82.2"/>
 <polygon fill="none" stroke="#000000" points="313.5,-82.2 313.5,-101.2 325.5,-101.2 325.5,-82.2 313.5,-82.2"/>
 <text text-anchor="start" x="316.4431" y="-88.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -56,7 +56,7 @@
 <text text-anchor="start" x="32.2027" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="50.5,-149.2 50.5,-168.2 122.5,-168.2 122.5,-149.2 50.5,-149.2"/>
 <polygon fill="none" stroke="#000000" points="50.5,-149.2 50.5,-168.2 122.5,-168.2 122.5,-149.2 50.5,-149.2"/>
-<text text-anchor="start" x="53.4896" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="53.4896" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="122.5,-149.2 122.5,-168.2 149.5,-168.2 149.5,-149.2 122.5,-149.2"/>
 <polygon fill="none" stroke="#000000" points="122.5,-149.2 122.5,-168.2 149.5,-168.2 149.5,-149.2 122.5,-149.2"/>
 <text text-anchor="start" x="125.1452" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot
index ff402159..6d3b5c7d 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot
@@ -29,7 +29,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="op_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">op_date</TD></TR></TABLE></TD><TD PORT="op_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
       <TR><TD PORT="email" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD><TD PORT="email.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -43,7 +43,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg
index c14fdc5d..fee6cdac 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg
@@ -52,7 +52,7 @@
 <text text-anchor="start" x="315.5" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-40.2 340.5,-59.2 397.5,-59.2 397.5,-40.2 340.5,-40.2"/>
 <polygon fill="none" stroke="#000000" points="340.5,-40.2 340.5,-59.2 397.5,-59.2 397.5,-40.2 340.5,-40.2"/>
-<text text-anchor="start" x="349.8807" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="349.8807" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="397.5,-40.2 397.5,-59.2 487.5,-59.2 487.5,-40.2 397.5,-40.2"/>
 <polygon fill="none" stroke="#000000" points="397.5,-40.2 397.5,-59.2 487.5,-59.2 487.5,-40.2 397.5,-40.2"/>
 <text text-anchor="start" x="468.9053" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -87,7 +87,7 @@
 <text text-anchor="start" x="11.5" y="-71.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-65.2 95.5,-84.2 200.5,-84.2 200.5,-65.2 95.5,-65.2"/>
 <polygon fill="none" stroke="#000000" points="95.5,-65.2 95.5,-84.2 200.5,-84.2 200.5,-65.2 95.5,-65.2"/>
-<text text-anchor="start" x="131.4791" y="-71.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-71.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-65.2 200.5,-84.2 261.5,-84.2 261.5,-65.2 200.5,-65.2"/>
 <polygon fill="none" stroke="#000000" points="200.5,-65.2 200.5,-84.2 261.5,-84.2 261.5,-65.2 200.5,-65.2"/>
 <text text-anchor="start" x="236.7904" y="-71.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot
index 6d3deec2..bd90e3fc 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -64,7 +64,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="op_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">op_date</TD></TR></TABLE></TD><TD PORT="op_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
       <TR><TD PORT="email" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD><TD PORT="email.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -97,7 +97,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -122,7 +122,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -133,7 +133,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -166,7 +166,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg
index dc23713f..646ede54 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="490.2027" y="-817.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="508.5,-811.7 508.5,-830.7 580.5,-830.7 580.5,-811.7 508.5,-811.7"/>
 <polygon fill="none" stroke="#000000" points="508.5,-811.7 508.5,-830.7 580.5,-830.7 580.5,-811.7 508.5,-811.7"/>
-<text text-anchor="start" x="511.4896" y="-817.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="511.4896" y="-817.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="580.5,-811.7 580.5,-830.7 592.5,-830.7 592.5,-811.7 580.5,-811.7"/>
 <polygon fill="none" stroke="#000000" points="580.5,-811.7 580.5,-830.7 592.5,-830.7 592.5,-811.7 580.5,-811.7"/>
 <text text-anchor="start" x="583.4431" y="-817.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
-<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <text text-anchor="start" x="376.7904" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -176,7 +176,7 @@
 <text text-anchor="start" x="455.5" y="-620.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="480.5,-614.7 480.5,-633.7 537.5,-633.7 537.5,-614.7 480.5,-614.7"/>
 <polygon fill="none" stroke="#000000" points="480.5,-614.7 480.5,-633.7 537.5,-633.7 537.5,-614.7 480.5,-614.7"/>
-<text text-anchor="start" x="489.8807" y="-620.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="489.8807" y="-620.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="537.5,-614.7 537.5,-633.7 627.5,-633.7 627.5,-614.7 537.5,-614.7"/>
 <polygon fill="none" stroke="#000000" points="537.5,-614.7 537.5,-633.7 627.5,-633.7 627.5,-614.7 537.5,-614.7"/>
 <text text-anchor="start" x="608.9053" y="-620.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -275,7 +275,7 @@
 <text text-anchor="start" x="487.5" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="507.5,-365.7 507.5,-384.7 580.5,-384.7 580.5,-365.7 507.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="507.5,-365.7 507.5,-384.7 580.5,-384.7 580.5,-365.7 507.5,-365.7"/>
-<text text-anchor="start" x="511.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="511.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="580.5,-365.7 580.5,-384.7 594.5,-384.7 594.5,-365.7 580.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="580.5,-365.7 580.5,-384.7 594.5,-384.7 594.5,-365.7 580.5,-365.7"/>
 <text text-anchor="start" x="585.3862" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -312,7 +312,7 @@
 <text text-anchor="start" x="490.2027" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="508.5,-283.7 508.5,-302.7 580.5,-302.7 580.5,-283.7 508.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="508.5,-283.7 508.5,-302.7 580.5,-302.7 580.5,-283.7 508.5,-283.7"/>
-<text text-anchor="start" x="511.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="511.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="580.5,-283.7 580.5,-302.7 592.5,-302.7 592.5,-283.7 580.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="580.5,-283.7 580.5,-302.7 592.5,-302.7 592.5,-283.7 580.5,-283.7"/>
 <text text-anchor="start" x="583.4431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -409,7 +409,7 @@
 <text text-anchor="start" x="490.2027" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="508.5,-37.7 508.5,-56.7 580.5,-56.7 580.5,-37.7 508.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="508.5,-37.7 508.5,-56.7 580.5,-56.7 580.5,-37.7 508.5,-37.7"/>
-<text text-anchor="start" x="511.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="511.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="580.5,-37.7 580.5,-56.7 592.5,-56.7 592.5,-37.7 580.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="580.5,-37.7 580.5,-56.7 592.5,-56.7 592.5,-37.7 580.5,-37.7"/>
 <text text-anchor="start" x="583.4431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot
index 06ef5072..4c52b621 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot
@@ -30,7 +30,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="op_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">op_date</TD></TR></TABLE></TD><TD PORT="op_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
       <TR><TD PORT="email" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD><TD PORT="email.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -44,7 +44,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg
index a64537eb..0c90c9e4 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg
@@ -52,7 +52,7 @@
 <text text-anchor="start" x="315.5" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-108.7 340.5,-127.7 397.5,-127.7 397.5,-108.7 340.5,-108.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-108.7 340.5,-127.7 397.5,-127.7 397.5,-108.7 340.5,-108.7"/>
-<text text-anchor="start" x="349.8807" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="349.8807" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="397.5,-108.7 397.5,-127.7 487.5,-127.7 487.5,-108.7 397.5,-108.7"/>
 <polygon fill="none" stroke="#000000" points="397.5,-108.7 397.5,-127.7 487.5,-127.7 487.5,-108.7 397.5,-108.7"/>
 <text text-anchor="start" x="468.9053" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -123,7 +123,7 @@
 <text text-anchor="start" x="11.5" y="-169.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-163.7 95.5,-182.7 200.5,-182.7 200.5,-163.7 95.5,-163.7"/>
 <polygon fill="none" stroke="#000000" points="95.5,-163.7 95.5,-182.7 200.5,-182.7 200.5,-163.7 95.5,-163.7"/>
-<text text-anchor="start" x="131.4791" y="-169.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-169.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-163.7 200.5,-182.7 261.5,-182.7 261.5,-163.7 200.5,-163.7"/>
 <polygon fill="none" stroke="#000000" points="200.5,-163.7 200.5,-182.7 261.5,-182.7 261.5,-163.7 200.5,-163.7"/>
 <text text-anchor="start" x="236.7904" y="-169.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot
index 33dca174..ab8ca224 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot
@@ -43,7 +43,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -70,7 +70,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="op_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">op_date</TD></TR></TABLE></TD><TD PORT="op_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
       <TR><TD PORT="email" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD><TD PORT="email.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -103,7 +103,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -139,7 +139,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -172,7 +172,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg
index add97890..369a08f7 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="493.2027" y="-896.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="511.5,-890.8506 511.5,-909.8506 583.5,-909.8506 583.5,-890.8506 511.5,-890.8506"/>
 <polygon fill="none" stroke="#000000" points="511.5,-890.8506 511.5,-909.8506 583.5,-909.8506 583.5,-890.8506 511.5,-890.8506"/>
-<text text-anchor="start" x="514.4896" y="-896.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="514.4896" y="-896.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="583.5,-890.8506 583.5,-909.8506 595.5,-909.8506 595.5,-890.8506 583.5,-890.8506"/>
 <polygon fill="none" stroke="#000000" points="583.5,-890.8506 583.5,-909.8506 595.5,-909.8506 595.5,-890.8506 583.5,-890.8506"/>
 <text text-anchor="start" x="586.4431" y="-896.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="154.5" y="-585.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="238.5,-579.8506 238.5,-598.8506 343.5,-598.8506 343.5,-579.8506 238.5,-579.8506"/>
 <polygon fill="none" stroke="#000000" points="238.5,-579.8506 238.5,-598.8506 343.5,-598.8506 343.5,-579.8506 238.5,-579.8506"/>
-<text text-anchor="start" x="274.4791" y="-585.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="274.4791" y="-585.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="343.5,-579.8506 343.5,-598.8506 404.5,-598.8506 404.5,-579.8506 343.5,-579.8506"/>
 <polygon fill="none" stroke="#000000" points="343.5,-579.8506 343.5,-598.8506 404.5,-598.8506 404.5,-579.8506 343.5,-579.8506"/>
 <text text-anchor="start" x="379.7904" y="-585.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -176,7 +176,7 @@
 <text text-anchor="start" x="458.5" y="-207.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="483.5,-201.8506 483.5,-220.8506 540.5,-220.8506 540.5,-201.8506 483.5,-201.8506"/>
 <polygon fill="none" stroke="#000000" points="483.5,-201.8506 483.5,-220.8506 540.5,-220.8506 540.5,-201.8506 483.5,-201.8506"/>
-<text text-anchor="start" x="492.8807" y="-207.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="492.8807" y="-207.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="540.5,-201.8506 540.5,-220.8506 630.5,-220.8506 630.5,-201.8506 540.5,-201.8506"/>
 <polygon fill="none" stroke="#000000" points="540.5,-201.8506 540.5,-220.8506 630.5,-220.8506 630.5,-201.8506 540.5,-201.8506"/>
 <text text-anchor="start" x="611.9053" y="-207.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -341,7 +341,7 @@
 <text text-anchor="start" x="490.5" y="-650.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="510.5,-644.8506 510.5,-663.8506 583.5,-663.8506 583.5,-644.8506 510.5,-644.8506"/>
 <polygon fill="none" stroke="#000000" points="510.5,-644.8506 510.5,-663.8506 583.5,-663.8506 583.5,-644.8506 510.5,-644.8506"/>
-<text text-anchor="start" x="514.4791" y="-650.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="514.4791" y="-650.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="583.5,-644.8506 583.5,-663.8506 597.5,-663.8506 597.5,-644.8506 583.5,-644.8506"/>
 <polygon fill="none" stroke="#000000" points="583.5,-644.8506 583.5,-663.8506 597.5,-663.8506 597.5,-644.8506 583.5,-644.8506"/>
 <text text-anchor="start" x="588.3862" y="-650.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -378,7 +378,7 @@
 <text text-anchor="start" x="493.2027" y="-568.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="511.5,-562.8506 511.5,-581.8506 583.5,-581.8506 583.5,-562.8506 511.5,-562.8506"/>
 <polygon fill="none" stroke="#000000" points="511.5,-562.8506 511.5,-581.8506 583.5,-581.8506 583.5,-562.8506 511.5,-562.8506"/>
-<text text-anchor="start" x="514.4896" y="-568.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="514.4896" y="-568.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="583.5,-562.8506 583.5,-581.8506 595.5,-581.8506 595.5,-562.8506 583.5,-562.8506"/>
 <polygon fill="none" stroke="#000000" points="583.5,-562.8506 583.5,-581.8506 595.5,-581.8506 595.5,-562.8506 583.5,-562.8506"/>
 <text text-anchor="start" x="586.4431" y="-568.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -475,7 +475,7 @@
 <text text-anchor="start" x="493.2027" y="-978.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="511.5,-972.8506 511.5,-991.8506 583.5,-991.8506 583.5,-972.8506 511.5,-972.8506"/>
 <polygon fill="none" stroke="#000000" points="511.5,-972.8506 511.5,-991.8506 583.5,-991.8506 583.5,-972.8506 511.5,-972.8506"/>
-<text text-anchor="start" x="514.4896" y="-978.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="514.4896" y="-978.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="583.5,-972.8506 583.5,-991.8506 595.5,-991.8506 595.5,-972.8506 583.5,-972.8506"/>
 <polygon fill="none" stroke="#000000" points="583.5,-972.8506 583.5,-991.8506 595.5,-991.8506 595.5,-972.8506 583.5,-972.8506"/>
 <text text-anchor="start" x="586.4431" y="-978.9506" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot
index ec6b42bc..3f567092 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>organizations</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg
index e30ae086..531f52e0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg
@@ -56,7 +56,7 @@
 <text text-anchor="start" x="37.7027" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="56,-149.2 56,-168.2 128,-168.2 128,-149.2 56,-149.2"/>
 <polygon fill="none" stroke="#000000" points="56,-149.2 56,-168.2 128,-168.2 128,-149.2 56,-149.2"/>
-<text text-anchor="start" x="58.9896" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="58.9896" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="128,-149.2 128,-168.2 155,-168.2 155,-149.2 128,-149.2"/>
 <polygon fill="none" stroke="#000000" points="128,-149.2 128,-168.2 155,-168.2 155,-149.2 128,-149.2"/>
 <text text-anchor="start" x="130.6452" y="-155.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot
index 29545366..9786f971 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot
@@ -41,7 +41,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg
index e7e27a84..84122d89 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg
@@ -76,7 +76,7 @@
 <text text-anchor="start" x="11.5" y="-49.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-43.2 95.5,-62.2 200.5,-62.2 200.5,-43.2 95.5,-43.2"/>
 <polygon fill="none" stroke="#000000" points="95.5,-43.2 95.5,-62.2 200.5,-62.2 200.5,-43.2 95.5,-43.2"/>
-<text text-anchor="start" x="131.4791" y="-49.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-49.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-43.2 200.5,-62.2 261.5,-62.2 261.5,-43.2 200.5,-43.2"/>
 <polygon fill="none" stroke="#000000" points="200.5,-43.2 200.5,-62.2 261.5,-62.2 261.5,-43.2 200.5,-43.2"/>
 <text text-anchor="start" x="236.7904" y="-49.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot
index 4b1bbc91..9849638d 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -95,7 +95,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -120,7 +120,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -131,7 +131,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -164,7 +164,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg
index 8ef2f3e2..29eb46bc 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="509.2027" y="-773.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-767.7 527.5,-786.7 599.5,-786.7 599.5,-767.7 527.5,-767.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-767.7 527.5,-786.7 599.5,-786.7 599.5,-767.7 527.5,-767.7"/>
-<text text-anchor="start" x="530.4896" y="-773.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="530.4896" y="-773.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-767.7 599.5,-786.7 611.5,-786.7 611.5,-767.7 599.5,-767.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-767.7 599.5,-786.7 611.5,-786.7 611.5,-767.7 599.5,-767.7"/>
 <text text-anchor="start" x="602.4431" y="-773.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
-<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <text text-anchor="start" x="376.7904" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="520.2026" y="-691.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="538.5,-685.7 538.5,-704.7 588.5,-704.7 588.5,-685.7 538.5,-685.7"/>
 <polygon fill="none" stroke="#000000" points="538.5,-685.7 538.5,-704.7 588.5,-704.7 588.5,-685.7 538.5,-685.7"/>
-<text text-anchor="start" x="541.1904" y="-691.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="541.1904" y="-691.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="588.5,-685.7 588.5,-704.7 600.5,-704.7 600.5,-685.7 588.5,-685.7"/>
 <polygon fill="none" stroke="#000000" points="588.5,-685.7 588.5,-704.7 600.5,-704.7 600.5,-685.7 588.5,-685.7"/>
 <text text-anchor="start" x="591.4431" y="-691.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -264,7 +264,7 @@
 <text text-anchor="start" x="506.5" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="526.5,-365.7 526.5,-384.7 599.5,-384.7 599.5,-365.7 526.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="526.5,-365.7 526.5,-384.7 599.5,-384.7 599.5,-365.7 526.5,-365.7"/>
-<text text-anchor="start" x="530.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="530.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-365.7 599.5,-384.7 613.5,-384.7 613.5,-365.7 599.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-365.7 599.5,-384.7 613.5,-384.7 613.5,-365.7 599.5,-365.7"/>
 <text text-anchor="start" x="604.3862" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -301,7 +301,7 @@
 <text text-anchor="start" x="509.2027" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-283.7 527.5,-302.7 599.5,-302.7 599.5,-283.7 527.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-283.7 527.5,-302.7 599.5,-302.7 599.5,-283.7 527.5,-283.7"/>
-<text text-anchor="start" x="530.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="530.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-283.7 599.5,-302.7 611.5,-302.7 611.5,-283.7 599.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-283.7 599.5,-302.7 611.5,-302.7 611.5,-283.7 599.5,-283.7"/>
 <text text-anchor="start" x="602.4431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -398,7 +398,7 @@
 <text text-anchor="start" x="509.2027" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-37.7 527.5,-56.7 599.5,-56.7 599.5,-37.7 527.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-37.7 527.5,-56.7 599.5,-56.7 599.5,-37.7 527.5,-37.7"/>
-<text text-anchor="start" x="530.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="530.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-37.7 599.5,-56.7 611.5,-56.7 611.5,-37.7 599.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-37.7 599.5,-56.7 611.5,-56.7 611.5,-37.7 599.5,-37.7"/>
 <text text-anchor="start" x="602.4431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot
index e142f121..e206ce8f 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot
@@ -46,7 +46,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg
index 7efe9154..560a1938 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg
@@ -94,7 +94,7 @@
 <text text-anchor="start" x="11.5" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-120.2 95.5,-139.2 200.5,-139.2 200.5,-120.2 95.5,-120.2"/>
 <polygon fill="none" stroke="#000000" points="95.5,-120.2 95.5,-139.2 200.5,-139.2 200.5,-120.2 95.5,-120.2"/>
-<text text-anchor="start" x="131.4791" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-120.2 200.5,-139.2 261.5,-139.2 261.5,-120.2 200.5,-120.2"/>
 <polygon fill="none" stroke="#000000" points="200.5,-120.2 200.5,-139.2 261.5,-139.2 261.5,-120.2 200.5,-120.2"/>
 <text text-anchor="start" x="236.7904" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot
index 08165da8..35328015 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -99,7 +99,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -124,7 +124,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -135,7 +135,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -168,7 +168,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg
index e771f686..883d478a 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="509.2027" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-855.7 527.5,-874.7 599.5,-874.7 599.5,-855.7 527.5,-855.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-855.7 527.5,-874.7 599.5,-874.7 599.5,-855.7 527.5,-855.7"/>
-<text text-anchor="start" x="530.4896" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="530.4896" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-855.7 599.5,-874.7 611.5,-874.7 611.5,-855.7 599.5,-855.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-855.7 599.5,-874.7 611.5,-874.7 611.5,-855.7 599.5,-855.7"/>
 <text text-anchor="start" x="602.4431" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-300.7 235.5,-319.7 340.5,-319.7 340.5,-300.7 235.5,-300.7"/>
-<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-300.7 340.5,-319.7 401.5,-319.7 401.5,-300.7 340.5,-300.7"/>
 <text text-anchor="start" x="376.7904" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="520.2026" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="538.5,-773.7 538.5,-792.7 588.5,-792.7 588.5,-773.7 538.5,-773.7"/>
 <polygon fill="none" stroke="#000000" points="538.5,-773.7 538.5,-792.7 588.5,-792.7 588.5,-773.7 538.5,-773.7"/>
-<text text-anchor="start" x="541.1904" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="541.1904" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="588.5,-773.7 588.5,-792.7 600.5,-792.7 600.5,-773.7 588.5,-773.7"/>
 <polygon fill="none" stroke="#000000" points="588.5,-773.7 588.5,-792.7 600.5,-792.7 600.5,-773.7 588.5,-773.7"/>
 <text text-anchor="start" x="591.4431" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -282,7 +282,7 @@
 <text text-anchor="start" x="506.5" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="526.5,-365.7 526.5,-384.7 599.5,-384.7 599.5,-365.7 526.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="526.5,-365.7 526.5,-384.7 599.5,-384.7 599.5,-365.7 526.5,-365.7"/>
-<text text-anchor="start" x="530.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="530.4791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-365.7 599.5,-384.7 613.5,-384.7 613.5,-365.7 599.5,-365.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-365.7 599.5,-384.7 613.5,-384.7 613.5,-365.7 599.5,-365.7"/>
 <text text-anchor="start" x="604.3862" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -319,7 +319,7 @@
 <text text-anchor="start" x="509.2027" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-283.7 527.5,-302.7 599.5,-302.7 599.5,-283.7 527.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-283.7 527.5,-302.7 599.5,-302.7 599.5,-283.7 527.5,-283.7"/>
-<text text-anchor="start" x="530.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="530.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-283.7 599.5,-302.7 611.5,-302.7 611.5,-283.7 599.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-283.7 599.5,-302.7 611.5,-302.7 611.5,-283.7 599.5,-283.7"/>
 <text text-anchor="start" x="602.4431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -416,7 +416,7 @@
 <text text-anchor="start" x="509.2027" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-37.7 527.5,-56.7 599.5,-56.7 599.5,-37.7 527.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-37.7 527.5,-56.7 599.5,-56.7 599.5,-37.7 527.5,-37.7"/>
-<text text-anchor="start" x="530.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="530.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-37.7 599.5,-56.7 611.5,-56.7 611.5,-37.7 599.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-37.7 599.5,-56.7 611.5,-56.7 611.5,-37.7 599.5,-37.7"/>
 <text text-anchor="start" x="602.4431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot
index 7240455e..340c1f03 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot
@@ -32,7 +32,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="modification_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modification_date</TD></TR></TABLE></TD><TD PORT="modification_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
       <TR><TD PORT="modified_by" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modified_by</TD></TR></TABLE></TD><TD PORT="modified_by.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="created_by" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">created_by</TD></TR></TABLE></TD><TD PORT="created_by.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -46,7 +46,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg
index fedd80ea..9edb792c 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg
@@ -58,7 +58,7 @@
 <text text-anchor="start" x="315.5" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="348.5,-40.2 348.5,-59.2 435.5,-59.2 435.5,-40.2 348.5,-40.2"/>
 <polygon fill="none" stroke="#000000" points="348.5,-40.2 348.5,-59.2 435.5,-59.2 435.5,-40.2 348.5,-40.2"/>
-<text text-anchor="start" x="366.4791" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="366.4791" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="435.5,-40.2 435.5,-59.2 525.5,-59.2 525.5,-40.2 435.5,-40.2"/>
 <polygon fill="none" stroke="#000000" points="435.5,-40.2 435.5,-59.2 525.5,-59.2 525.5,-40.2 435.5,-40.2"/>
 <text text-anchor="start" x="506.9053" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -93,7 +93,7 @@
 <text text-anchor="start" x="11.5" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-120.2 95.5,-139.2 200.5,-139.2 200.5,-120.2 95.5,-120.2"/>
 <polygon fill="none" stroke="#000000" points="95.5,-120.2 95.5,-139.2 200.5,-139.2 200.5,-120.2 95.5,-120.2"/>
-<text text-anchor="start" x="131.4791" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-120.2 200.5,-139.2 261.5,-139.2 261.5,-120.2 200.5,-120.2"/>
 <polygon fill="none" stroke="#000000" points="200.5,-120.2 200.5,-139.2 261.5,-139.2 261.5,-120.2 200.5,-120.2"/>
 <text text-anchor="start" x="236.7904" y="-126.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot
index 2083550a..2a98b50c 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -99,7 +99,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="modification_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modification_date</TD></TR></TABLE></TD><TD PORT="modification_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
       <TR><TD PORT="modified_by" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">modified_by</TD></TR></TABLE></TD><TD PORT="modified_by.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="created_by" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">created_by</TD></TR></TABLE></TD><TD PORT="created_by.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -124,7 +124,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -135,7 +135,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -168,7 +168,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg
index cd6c8091..ef7e369d 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="509.2027" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-855.7 527.5,-874.7 599.5,-874.7 599.5,-855.7 527.5,-855.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-855.7 527.5,-874.7 599.5,-874.7 599.5,-855.7 527.5,-855.7"/>
-<text text-anchor="start" x="530.4896" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="530.4896" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-855.7 599.5,-874.7 611.5,-874.7 611.5,-855.7 599.5,-855.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-855.7 599.5,-874.7 611.5,-874.7 611.5,-855.7 599.5,-855.7"/>
 <text text-anchor="start" x="602.4431" y="-861.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-454.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-448.7 235.5,-467.7 340.5,-467.7 340.5,-448.7 235.5,-448.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-448.7 235.5,-467.7 340.5,-467.7 340.5,-448.7 235.5,-448.7"/>
-<text text-anchor="start" x="271.4791" y="-454.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-454.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-448.7 340.5,-467.7 401.5,-467.7 401.5,-448.7 340.5,-448.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-448.7 340.5,-467.7 401.5,-467.7 401.5,-448.7 340.5,-448.7"/>
 <text text-anchor="start" x="376.7904" y="-454.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="520.2026" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="538.5,-773.7 538.5,-792.7 588.5,-792.7 588.5,-773.7 538.5,-773.7"/>
 <polygon fill="none" stroke="#000000" points="538.5,-773.7 538.5,-792.7 588.5,-792.7 588.5,-773.7 538.5,-773.7"/>
-<text text-anchor="start" x="541.1904" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="541.1904" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="588.5,-773.7 588.5,-792.7 600.5,-792.7 600.5,-773.7 588.5,-773.7"/>
 <polygon fill="none" stroke="#000000" points="588.5,-773.7 588.5,-792.7 600.5,-792.7 600.5,-773.7 588.5,-773.7"/>
 <text text-anchor="start" x="591.4431" y="-779.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -280,7 +280,7 @@
 <text text-anchor="start" x="455.5" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="488.5,-368.7 488.5,-387.7 575.5,-387.7 575.5,-368.7 488.5,-368.7"/>
 <polygon fill="none" stroke="#000000" points="488.5,-368.7 488.5,-387.7 575.5,-387.7 575.5,-368.7 488.5,-368.7"/>
-<text text-anchor="start" x="506.4791" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="506.4791" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="575.5,-368.7 575.5,-387.7 665.5,-387.7 665.5,-368.7 575.5,-368.7"/>
 <polygon fill="none" stroke="#000000" points="575.5,-368.7 575.5,-387.7 665.5,-387.7 665.5,-368.7 575.5,-368.7"/>
 <text text-anchor="start" x="646.9053" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -318,7 +318,7 @@
 <text text-anchor="start" x="509.2027" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-283.7 527.5,-302.7 599.5,-302.7 599.5,-283.7 527.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-283.7 527.5,-302.7 599.5,-302.7 599.5,-283.7 527.5,-283.7"/>
-<text text-anchor="start" x="530.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="530.4896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-283.7 599.5,-302.7 611.5,-302.7 611.5,-283.7 599.5,-283.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-283.7 599.5,-302.7 611.5,-302.7 611.5,-283.7 599.5,-283.7"/>
 <text text-anchor="start" x="602.4431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -415,7 +415,7 @@
 <text text-anchor="start" x="509.2027" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="527.5,-37.7 527.5,-56.7 599.5,-56.7 599.5,-37.7 527.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="527.5,-37.7 527.5,-56.7 599.5,-56.7 599.5,-37.7 527.5,-37.7"/>
-<text text-anchor="start" x="530.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="530.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="599.5,-37.7 599.5,-56.7 611.5,-56.7 611.5,-37.7 599.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="599.5,-37.7 599.5,-56.7 611.5,-56.7 611.5,-37.7 599.5,-37.7"/>
 <text text-anchor="start" x="602.4431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot
index e49a309e..23b765f5 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot
@@ -39,7 +39,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg
index ba668423..7e1f8727 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg
@@ -37,7 +37,7 @@
 <text text-anchor="start" x="232.5" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="316.5,-37.7 316.5,-56.7 421.5,-56.7 421.5,-37.7 316.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="316.5,-37.7 316.5,-56.7 421.5,-56.7 421.5,-37.7 316.5,-37.7"/>
-<text text-anchor="start" x="352.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="352.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="421.5,-37.7 421.5,-56.7 482.5,-56.7 482.5,-37.7 421.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="421.5,-37.7 421.5,-56.7 482.5,-56.7 482.5,-37.7 421.5,-37.7"/>
 <text text-anchor="start" x="457.7904" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot
index 628301bd..f33545cd 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -92,7 +92,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -118,7 +118,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -129,7 +129,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -162,7 +162,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg
index f8306bde..f8a97246 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="536.7026" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="555,-693.7 555,-712.7 627,-712.7 627,-693.7 555,-693.7"/>
 <polygon fill="none" stroke="#000000" points="555,-693.7 555,-712.7 627,-712.7 627,-693.7 555,-693.7"/>
-<text text-anchor="start" x="557.9896" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="557.9896" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="627,-693.7 627,-712.7 639,-712.7 639,-693.7 627,-693.7"/>
 <polygon fill="none" stroke="#000000" points="627,-693.7 627,-712.7 639,-712.7 639,-693.7 627,-693.7"/>
 <text text-anchor="start" x="629.9431" y="-699.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="232.5" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="316.5,-300.7 316.5,-319.7 421.5,-319.7 421.5,-300.7 316.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="316.5,-300.7 316.5,-319.7 421.5,-319.7 421.5,-300.7 316.5,-300.7"/>
-<text text-anchor="start" x="352.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="352.4791" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="421.5,-300.7 421.5,-319.7 482.5,-319.7 482.5,-300.7 421.5,-300.7"/>
 <polygon fill="none" stroke="#000000" points="421.5,-300.7 421.5,-319.7 482.5,-319.7 482.5,-300.7 421.5,-300.7"/>
 <text text-anchor="start" x="457.7904" y="-306.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -158,7 +158,7 @@
 <text text-anchor="start" x="547.7026" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="566,-611.7 566,-630.7 616,-630.7 616,-611.7 566,-611.7"/>
 <polygon fill="none" stroke="#000000" points="566,-611.7 566,-630.7 616,-630.7 616,-611.7 566,-611.7"/>
-<text text-anchor="start" x="568.6904" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="568.6904" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="616,-611.7 616,-630.7 628,-630.7 628,-611.7 616,-611.7"/>
 <polygon fill="none" stroke="#000000" points="616,-611.7 616,-630.7 628,-630.7 628,-611.7 616,-611.7"/>
 <text text-anchor="start" x="618.9431" y="-617.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -256,7 +256,7 @@
 <text text-anchor="start" x="534" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="554,-365.7 554,-384.7 627,-384.7 627,-365.7 554,-365.7"/>
 <polygon fill="none" stroke="#000000" points="554,-365.7 554,-384.7 627,-384.7 627,-365.7 554,-365.7"/>
-<text text-anchor="start" x="557.9791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="557.9791" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="627,-365.7 627,-384.7 641,-384.7 641,-365.7 627,-365.7"/>
 <polygon fill="none" stroke="#000000" points="627,-365.7 627,-384.7 641,-384.7 641,-365.7 627,-365.7"/>
 <text text-anchor="start" x="631.8862" y="-371.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -293,7 +293,7 @@
 <text text-anchor="start" x="536.7026" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="555,-283.7 555,-302.7 627,-302.7 627,-283.7 555,-283.7"/>
 <polygon fill="none" stroke="#000000" points="555,-283.7 555,-302.7 627,-302.7 627,-283.7 555,-283.7"/>
-<text text-anchor="start" x="557.9896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="557.9896" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="627,-283.7 627,-302.7 639,-302.7 639,-283.7 627,-283.7"/>
 <polygon fill="none" stroke="#000000" points="627,-283.7 627,-302.7 639,-302.7 639,-283.7 627,-283.7"/>
 <text text-anchor="start" x="629.9431" y="-289.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -390,7 +390,7 @@
 <text text-anchor="start" x="536.7026" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="555,-37.7 555,-56.7 627,-56.7 627,-37.7 555,-37.7"/>
 <polygon fill="none" stroke="#000000" points="555,-37.7 555,-56.7 627,-56.7 627,-37.7 555,-37.7"/>
-<text text-anchor="start" x="557.9896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="557.9896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="627,-37.7 627,-56.7 639,-56.7 639,-37.7 627,-37.7"/>
 <polygon fill="none" stroke="#000000" points="627,-37.7 627,-56.7 639,-56.7 639,-37.7 627,-37.7"/>
 <text text-anchor="start" x="629.9431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot
index 2e33dbc6..43033672 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot
@@ -38,7 +38,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -64,7 +64,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -103,7 +103,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="local_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">local_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="oa_original_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -147,7 +147,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="ec_enterprise" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_enterprise</TD></TR></TABLE></TD><TD PORT="ec_enterprise.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_smevalidated" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_smevalidated</TD></TR></TABLE></TD><TD PORT="ec_smevalidated.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_nutscode" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_nutscode</TD></TR></TABLE></TD><TD PORT="ec_nutscode.type" ALIGN="LEFT">bool[1]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -160,7 +160,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -198,7 +198,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg
index aacbbfc8..02a62c9a 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="558.2026" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-1059.2 576.5,-1078.2 648.5,-1078.2 648.5,-1059.2 576.5,-1059.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-1059.2 576.5,-1078.2 648.5,-1078.2 648.5,-1059.2 576.5,-1059.2"/>
-<text text-anchor="start" x="579.4896" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="579.4896" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-1059.2 648.5,-1078.2 660.5,-1078.2 660.5,-1059.2 648.5,-1059.2"/>
 <polygon fill="none" stroke="#000000" points="648.5,-1059.2 648.5,-1078.2 660.5,-1078.2 660.5,-1059.2 648.5,-1059.2"/>
 <text text-anchor="start" x="651.4431" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -144,7 +144,7 @@
 <text text-anchor="start" x="153.5" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="251.5,-100.2 251.5,-119.2 403.5,-119.2 403.5,-100.2 251.5,-100.2"/>
 <polygon fill="none" stroke="#000000" points="251.5,-100.2 251.5,-119.2 403.5,-119.2 403.5,-100.2 251.5,-100.2"/>
-<text text-anchor="start" x="334.4791" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="334.4791" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="403.5,-100.2 403.5,-119.2 495.5,-119.2 495.5,-100.2 403.5,-100.2"/>
 <polygon fill="none" stroke="#000000" points="403.5,-100.2 403.5,-119.2 495.5,-119.2 495.5,-100.2 403.5,-100.2"/>
 <text text-anchor="start" x="470.7904" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -251,7 +251,7 @@
 <text text-anchor="start" x="568.5" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="587.5,-910.2 587.5,-929.2 637.5,-929.2 637.5,-910.2 587.5,-910.2"/>
 <polygon fill="none" stroke="#000000" points="587.5,-910.2 587.5,-929.2 637.5,-929.2 637.5,-910.2 587.5,-910.2"/>
-<text text-anchor="start" x="590.1904" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="590.1904" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="637.5,-910.2 637.5,-929.2 650.5,-929.2 650.5,-910.2 637.5,-910.2"/>
 <polygon fill="none" stroke="#000000" points="637.5,-910.2 637.5,-929.2 650.5,-929.2 650.5,-910.2 637.5,-910.2"/>
 <text text-anchor="start" x="641.3862" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -367,7 +367,7 @@
 <text text-anchor="start" x="549.5" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-532.2 576.5,-551.2 652.5,-551.2 652.5,-532.2 576.5,-532.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-532.2 576.5,-551.2 652.5,-551.2 652.5,-532.2 576.5,-532.2"/>
-<text text-anchor="start" x="583.4791" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="583.4791" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="652.5,-532.2 652.5,-551.2 669.5,-551.2 669.5,-532.2 652.5,-532.2"/>
 <polygon fill="none" stroke="#000000" points="652.5,-532.2 652.5,-551.2 669.5,-551.2 669.5,-532.2 652.5,-532.2"/>
 <text text-anchor="start" x="660.3862" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -411,7 +411,7 @@
 <text text-anchor="start" x="558.2026" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-403.2 576.5,-422.2 648.5,-422.2 648.5,-403.2 576.5,-403.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-403.2 576.5,-422.2 648.5,-422.2 648.5,-403.2 576.5,-403.2"/>
-<text text-anchor="start" x="579.4896" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="579.4896" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-403.2 648.5,-422.2 660.5,-422.2 660.5,-403.2 648.5,-403.2"/>
 <polygon fill="none" stroke="#000000" points="648.5,-403.2 648.5,-422.2 660.5,-422.2 660.5,-403.2 648.5,-403.2"/>
 <text text-anchor="start" x="651.4431" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -526,7 +526,7 @@
 <text text-anchor="start" x="558.2026" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-38.2 576.5,-57.2 648.5,-57.2 648.5,-38.2 576.5,-38.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-38.2 576.5,-57.2 648.5,-57.2 648.5,-38.2 576.5,-38.2"/>
-<text text-anchor="start" x="579.4896" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="579.4896" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-38.2 648.5,-57.2 660.5,-57.2 660.5,-38.2 648.5,-38.2"/>
 <polygon fill="none" stroke="#000000" points="648.5,-38.2 648.5,-57.2 660.5,-57.2 660.5,-38.2 648.5,-38.2"/>
 <text text-anchor="start" x="651.4431" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot
index 8d3ccba5..9d0fcd94 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot
@@ -41,7 +41,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -78,7 +78,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="local_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">local_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="oa_original_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -172,7 +172,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="ec_enterprise" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_enterprise</TD></TR></TABLE></TD><TD PORT="ec_enterprise.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_smevalidated" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_smevalidated</TD></TR></TABLE></TD><TD PORT="ec_smevalidated.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_nutscode" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_nutscode</TD></TR></TABLE></TD><TD PORT="ec_nutscode.type" ALIGN="LEFT">bool[1]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -185,7 +185,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -223,7 +223,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg
index 04179ab5..7e70cc23 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="558.2026" y="-381.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-375.7 576.5,-394.7 648.5,-394.7 648.5,-375.7 576.5,-375.7"/>
 <polygon fill="none" stroke="#000000" points="576.5,-375.7 576.5,-394.7 648.5,-394.7 648.5,-375.7 576.5,-375.7"/>
-<text text-anchor="start" x="579.4896" y="-381.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="579.4896" y="-381.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-375.7 648.5,-394.7 660.5,-394.7 660.5,-375.7 648.5,-375.7"/>
 <polygon fill="none" stroke="#000000" points="648.5,-375.7 648.5,-394.7 660.5,-394.7 660.5,-375.7 648.5,-375.7"/>
 <text text-anchor="start" x="651.4431" y="-381.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -144,7 +144,7 @@
 <text text-anchor="start" x="153.5" y="-292.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="251.5,-286.7 251.5,-305.7 403.5,-305.7 403.5,-286.7 251.5,-286.7"/>
 <polygon fill="none" stroke="#000000" points="251.5,-286.7 251.5,-305.7 403.5,-305.7 403.5,-286.7 251.5,-286.7"/>
-<text text-anchor="start" x="334.4791" y="-292.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="334.4791" y="-292.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="403.5,-286.7 403.5,-305.7 495.5,-305.7 495.5,-286.7 403.5,-286.7"/>
 <polygon fill="none" stroke="#000000" points="403.5,-286.7 403.5,-305.7 495.5,-305.7 495.5,-286.7 403.5,-286.7"/>
 <text text-anchor="start" x="470.7904" y="-292.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -251,7 +251,7 @@
 <text text-anchor="start" x="568.5" y="-1102.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="587.5,-1096.7 587.5,-1115.7 637.5,-1115.7 637.5,-1096.7 587.5,-1096.7"/>
 <polygon fill="none" stroke="#000000" points="587.5,-1096.7 587.5,-1115.7 637.5,-1115.7 637.5,-1096.7 587.5,-1096.7"/>
-<text text-anchor="start" x="590.1904" y="-1102.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="590.1904" y="-1102.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="637.5,-1096.7 637.5,-1115.7 650.5,-1115.7 650.5,-1096.7 637.5,-1096.7"/>
 <polygon fill="none" stroke="#000000" points="637.5,-1096.7 637.5,-1115.7 650.5,-1115.7 650.5,-1096.7 637.5,-1096.7"/>
 <text text-anchor="start" x="641.3862" y="-1102.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -367,7 +367,7 @@
 <text text-anchor="start" x="549.5" y="-724.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-718.7 576.5,-737.7 652.5,-737.7 652.5,-718.7 576.5,-718.7"/>
 <polygon fill="none" stroke="#000000" points="576.5,-718.7 576.5,-737.7 652.5,-737.7 652.5,-718.7 576.5,-718.7"/>
-<text text-anchor="start" x="583.4791" y="-724.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="583.4791" y="-724.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="652.5,-718.7 652.5,-737.7 669.5,-737.7 669.5,-718.7 652.5,-718.7"/>
 <polygon fill="none" stroke="#000000" points="652.5,-718.7 652.5,-737.7 669.5,-737.7 669.5,-718.7 652.5,-718.7"/>
 <text text-anchor="start" x="660.3862" y="-724.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -411,7 +411,7 @@
 <text text-anchor="start" x="558.2026" y="-229.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-223.7 576.5,-242.7 648.5,-242.7 648.5,-223.7 576.5,-223.7"/>
 <polygon fill="none" stroke="#000000" points="576.5,-223.7 576.5,-242.7 648.5,-242.7 648.5,-223.7 576.5,-223.7"/>
-<text text-anchor="start" x="579.4896" y="-229.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="579.4896" y="-229.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-223.7 648.5,-242.7 660.5,-242.7 660.5,-223.7 648.5,-223.7"/>
 <polygon fill="none" stroke="#000000" points="648.5,-223.7 648.5,-242.7 660.5,-242.7 660.5,-223.7 648.5,-223.7"/>
 <text text-anchor="start" x="651.4431" y="-229.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -586,7 +586,7 @@
 <text text-anchor="start" x="558.2026" y="-488.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-482.7 576.5,-501.7 648.5,-501.7 648.5,-482.7 576.5,-482.7"/>
 <polygon fill="none" stroke="#000000" points="576.5,-482.7 576.5,-501.7 648.5,-501.7 648.5,-482.7 576.5,-482.7"/>
-<text text-anchor="start" x="579.4896" y="-488.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="579.4896" y="-488.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-482.7 648.5,-501.7 660.5,-501.7 660.5,-482.7 648.5,-482.7"/>
 <polygon fill="none" stroke="#000000" points="648.5,-482.7 648.5,-501.7 660.5,-501.7 660.5,-482.7 648.5,-482.7"/>
 <text text-anchor="start" x="651.4431" y="-488.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot
index 04e94ae6..24034db7 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot
@@ -38,7 +38,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -64,7 +64,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -103,7 +103,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="local_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">local_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="oa_original_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -147,7 +147,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="ec_enterprise" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_enterprise</TD></TR></TABLE></TD><TD PORT="ec_enterprise.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_smevalidated" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_smevalidated</TD></TR></TABLE></TD><TD PORT="ec_smevalidated.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_nutscode" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_nutscode</TD></TR></TABLE></TD><TD PORT="ec_nutscode.type" ALIGN="LEFT">bool[1]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -160,7 +160,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -198,7 +198,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg
index 23b191dd..8dabcec9 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="558.2026" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-1059.2 576.5,-1078.2 648.5,-1078.2 648.5,-1059.2 576.5,-1059.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-1059.2 576.5,-1078.2 648.5,-1078.2 648.5,-1059.2 576.5,-1059.2"/>
-<text text-anchor="start" x="579.4896" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="579.4896" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-1059.2 648.5,-1078.2 660.5,-1078.2 660.5,-1059.2 648.5,-1059.2"/>
 <polygon fill="none" stroke="#000000" points="648.5,-1059.2 648.5,-1078.2 660.5,-1078.2 660.5,-1059.2 648.5,-1059.2"/>
 <text text-anchor="start" x="651.4431" y="-1065.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -144,7 +144,7 @@
 <text text-anchor="start" x="153.5" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="251.5,-100.2 251.5,-119.2 403.5,-119.2 403.5,-100.2 251.5,-100.2"/>
 <polygon fill="none" stroke="#000000" points="251.5,-100.2 251.5,-119.2 403.5,-119.2 403.5,-100.2 251.5,-100.2"/>
-<text text-anchor="start" x="334.4791" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="334.4791" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="403.5,-100.2 403.5,-119.2 495.5,-119.2 495.5,-100.2 403.5,-100.2"/>
 <polygon fill="none" stroke="#000000" points="403.5,-100.2 403.5,-119.2 495.5,-119.2 495.5,-100.2 403.5,-100.2"/>
 <text text-anchor="start" x="470.7904" y="-106.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -251,7 +251,7 @@
 <text text-anchor="start" x="568.5" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="587.5,-910.2 587.5,-929.2 637.5,-929.2 637.5,-910.2 587.5,-910.2"/>
 <polygon fill="none" stroke="#000000" points="587.5,-910.2 587.5,-929.2 637.5,-929.2 637.5,-910.2 587.5,-910.2"/>
-<text text-anchor="start" x="590.1904" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="590.1904" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="637.5,-910.2 637.5,-929.2 650.5,-929.2 650.5,-910.2 637.5,-910.2"/>
 <polygon fill="none" stroke="#000000" points="637.5,-910.2 637.5,-929.2 650.5,-929.2 650.5,-910.2 637.5,-910.2"/>
 <text text-anchor="start" x="641.3862" y="-916.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -367,7 +367,7 @@
 <text text-anchor="start" x="549.5" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-532.2 576.5,-551.2 652.5,-551.2 652.5,-532.2 576.5,-532.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-532.2 576.5,-551.2 652.5,-551.2 652.5,-532.2 576.5,-532.2"/>
-<text text-anchor="start" x="583.4791" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="583.4791" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="652.5,-532.2 652.5,-551.2 669.5,-551.2 669.5,-532.2 652.5,-532.2"/>
 <polygon fill="none" stroke="#000000" points="652.5,-532.2 652.5,-551.2 669.5,-551.2 669.5,-532.2 652.5,-532.2"/>
 <text text-anchor="start" x="660.3862" y="-538.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -411,7 +411,7 @@
 <text text-anchor="start" x="558.2026" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-403.2 576.5,-422.2 648.5,-422.2 648.5,-403.2 576.5,-403.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-403.2 576.5,-422.2 648.5,-422.2 648.5,-403.2 576.5,-403.2"/>
-<text text-anchor="start" x="579.4896" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="579.4896" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-403.2 648.5,-422.2 660.5,-422.2 660.5,-403.2 648.5,-403.2"/>
 <polygon fill="none" stroke="#000000" points="648.5,-403.2 648.5,-422.2 660.5,-422.2 660.5,-403.2 648.5,-403.2"/>
 <text text-anchor="start" x="651.4431" y="-409.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -526,7 +526,7 @@
 <text text-anchor="start" x="558.2026" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-38.2 576.5,-57.2 648.5,-57.2 648.5,-38.2 576.5,-38.2"/>
 <polygon fill="none" stroke="#000000" points="576.5,-38.2 576.5,-57.2 648.5,-57.2 648.5,-38.2 576.5,-38.2"/>
-<text text-anchor="start" x="579.4896" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="579.4896" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-38.2 648.5,-57.2 660.5,-57.2 660.5,-38.2 648.5,-38.2"/>
 <polygon fill="none" stroke="#000000" points="648.5,-38.2 648.5,-57.2 660.5,-57.2 660.5,-38.2 648.5,-38.2"/>
 <text text-anchor="start" x="651.4431" y="-44.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot
index 414452a8..bfb156b2 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot
@@ -43,7 +43,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16">acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -80,7 +80,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -130,7 +130,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="local_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">local_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="oa_original_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="102" HEIGHT="16">oa_original_id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -174,7 +174,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="ec_enterprise" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_enterprise</TD></TR></TABLE></TD><TD PORT="ec_enterprise.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_smevalidated" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_smevalidated</TD></TR></TABLE></TD><TD PORT="ec_smevalidated.type" ALIGN="LEFT">bool[1]</TD></TR>
       <TR><TD PORT="ec_nutscode" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">ec_nutscode</TD></TR></TABLE></TD><TD PORT="ec_nutscode.type" ALIGN="LEFT">bool[1]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -187,7 +187,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="otherid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="type" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -225,7 +225,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg
index 0a5571cc..1c36c630 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg
@@ -30,7 +30,7 @@
 <text text-anchor="start" x="558.2026" y="-1160.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-1154.3274 576.5,-1173.3274 648.5,-1173.3274 648.5,-1154.3274 576.5,-1154.3274"/>
 <polygon fill="none" stroke="#000000" points="576.5,-1154.3274 576.5,-1173.3274 648.5,-1173.3274 648.5,-1154.3274 576.5,-1154.3274"/>
-<text text-anchor="start" x="579.4896" y="-1160.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="579.4896" y="-1160.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-1154.3274 648.5,-1173.3274 660.5,-1173.3274 660.5,-1154.3274 648.5,-1154.3274"/>
 <polygon fill="none" stroke="#000000" points="648.5,-1154.3274 648.5,-1173.3274 660.5,-1173.3274 660.5,-1154.3274 648.5,-1154.3274"/>
 <text text-anchor="start" x="651.4431" y="-1160.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -144,7 +144,7 @@
 <text text-anchor="start" x="153.5" y="-357.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="251.5,-351.3274 251.5,-370.3274 403.5,-370.3274 403.5,-351.3274 251.5,-351.3274"/>
 <polygon fill="none" stroke="#000000" points="251.5,-351.3274 251.5,-370.3274 403.5,-370.3274 403.5,-351.3274 251.5,-351.3274"/>
-<text text-anchor="start" x="334.4791" y="-357.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="334.4791" y="-357.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="403.5,-351.3274 403.5,-370.3274 495.5,-370.3274 495.5,-351.3274 403.5,-351.3274"/>
 <polygon fill="none" stroke="#000000" points="403.5,-351.3274 403.5,-370.3274 495.5,-370.3274 495.5,-351.3274 403.5,-351.3274"/>
 <text text-anchor="start" x="470.7904" y="-357.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -251,7 +251,7 @@
 <text text-anchor="start" x="568.5" y="-138.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="587.5,-132.3274 587.5,-151.3274 637.5,-151.3274 637.5,-132.3274 587.5,-132.3274"/>
 <polygon fill="none" stroke="#000000" points="587.5,-132.3274 587.5,-151.3274 637.5,-151.3274 637.5,-132.3274 587.5,-132.3274"/>
-<text text-anchor="start" x="590.1904" y="-138.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="590.1904" y="-138.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="637.5,-132.3274 637.5,-151.3274 650.5,-151.3274 650.5,-132.3274 637.5,-132.3274"/>
 <polygon fill="none" stroke="#000000" points="637.5,-132.3274 637.5,-151.3274 650.5,-151.3274 650.5,-132.3274 637.5,-132.3274"/>
 <text text-anchor="start" x="641.3862" y="-138.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -397,7 +397,7 @@
 <text text-anchor="start" x="549.5" y="-781.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-775.3274 576.5,-794.3274 652.5,-794.3274 652.5,-775.3274 576.5,-775.3274"/>
 <polygon fill="none" stroke="#000000" points="576.5,-775.3274 576.5,-794.3274 652.5,-794.3274 652.5,-775.3274 576.5,-775.3274"/>
-<text text-anchor="start" x="583.4791" y="-781.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="583.4791" y="-781.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="652.5,-775.3274 652.5,-794.3274 669.5,-794.3274 669.5,-775.3274 652.5,-775.3274"/>
 <polygon fill="none" stroke="#000000" points="652.5,-775.3274 652.5,-794.3274 669.5,-794.3274 669.5,-775.3274 652.5,-775.3274"/>
 <text text-anchor="start" x="660.3862" y="-781.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -441,7 +441,7 @@
 <text text-anchor="start" x="558.2026" y="-416.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-410.3274 576.5,-429.3274 648.5,-429.3274 648.5,-410.3274 576.5,-410.3274"/>
 <polygon fill="none" stroke="#000000" points="576.5,-410.3274 576.5,-429.3274 648.5,-429.3274 648.5,-410.3274 576.5,-410.3274"/>
-<text text-anchor="start" x="579.4896" y="-416.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="579.4896" y="-416.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-410.3274 648.5,-429.3274 660.5,-429.3274 660.5,-410.3274 648.5,-410.3274"/>
 <polygon fill="none" stroke="#000000" points="648.5,-410.3274 648.5,-429.3274 660.5,-429.3274 660.5,-410.3274 648.5,-410.3274"/>
 <text text-anchor="start" x="651.4431" y="-416.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -616,7 +616,7 @@
 <text text-anchor="start" x="558.2026" y="-545.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="576.5,-539.3274 576.5,-558.3274 648.5,-558.3274 648.5,-539.3274 576.5,-539.3274"/>
 <polygon fill="none" stroke="#000000" points="576.5,-539.3274 576.5,-558.3274 648.5,-558.3274 648.5,-539.3274 576.5,-539.3274"/>
-<text text-anchor="start" x="579.4896" y="-545.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="579.4896" y="-545.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="648.5,-539.3274 648.5,-558.3274 660.5,-558.3274 660.5,-539.3274 648.5,-539.3274"/>
 <polygon fill="none" stroke="#000000" points="648.5,-539.3274 648.5,-558.3274 660.5,-558.3274 660.5,-539.3274 648.5,-539.3274"/>
 <text text-anchor="start" x="651.4431" y="-545.4274" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot
index c5629c4d..779da781 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot
@@ -40,7 +40,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -53,7 +53,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="otherid" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD><TD PORT="otherid.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="type" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD><TD PORT="type.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg
index ae891c1c..2e626bb5 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg
@@ -39,7 +39,7 @@
 <text text-anchor="start" x="315.2027" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="333.5,-108.7 333.5,-127.7 405.5,-127.7 405.5,-108.7 333.5,-108.7"/>
 <polygon fill="none" stroke="#000000" points="333.5,-108.7 333.5,-127.7 405.5,-127.7 405.5,-108.7 333.5,-108.7"/>
-<text text-anchor="start" x="336.4896" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="336.4896" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="405.5,-108.7 405.5,-127.7 495.5,-127.7 495.5,-108.7 405.5,-108.7"/>
 <polygon fill="none" stroke="#000000" points="405.5,-108.7 405.5,-127.7 495.5,-127.7 495.5,-108.7 405.5,-108.7"/>
 <text text-anchor="start" x="476.9053" y="-114.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -74,7 +74,7 @@
 <text text-anchor="start" x="11.5" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-141.7 95.5,-160.7 200.5,-160.7 200.5,-141.7 95.5,-141.7"/>
 <polygon fill="none" stroke="#000000" points="95.5,-141.7 95.5,-160.7 200.5,-160.7 200.5,-141.7 95.5,-141.7"/>
-<text text-anchor="start" x="131.4791" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-141.7 200.5,-160.7 261.5,-160.7 261.5,-141.7 200.5,-141.7"/>
 <polygon fill="none" stroke="#000000" points="200.5,-141.7 200.5,-160.7 261.5,-160.7 261.5,-141.7 200.5,-141.7"/>
 <text text-anchor="start" x="236.7904" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot
index 79f84b17..79766969 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot
@@ -38,7 +38,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -72,7 +72,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -105,7 +105,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -130,7 +130,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -143,7 +143,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="otherid" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">otherid</TD></TR></TABLE></TD><TD PORT="otherid.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="type" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="54" HEIGHT="16">type</TD></TR></TABLE></TD><TD PORT="type.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -176,7 +176,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg
index 5e9adb5a..d49450d5 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="494.2027" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-761.7 512.5,-780.7 584.5,-780.7 584.5,-761.7 512.5,-761.7"/>
 <polygon fill="none" stroke="#000000" points="512.5,-761.7 512.5,-780.7 584.5,-780.7 584.5,-761.7 512.5,-761.7"/>
-<text text-anchor="start" x="515.4896" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="515.4896" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-761.7 584.5,-780.7 596.5,-780.7 596.5,-761.7 584.5,-761.7"/>
 <polygon fill="none" stroke="#000000" points="584.5,-761.7 584.5,-780.7 596.5,-780.7 596.5,-761.7 584.5,-761.7"/>
 <text text-anchor="start" x="587.4431" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-368.7 235.5,-387.7 340.5,-387.7 340.5,-368.7 235.5,-368.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-368.7 235.5,-387.7 340.5,-387.7 340.5,-368.7 235.5,-368.7"/>
-<text text-anchor="start" x="271.4791" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-368.7 340.5,-387.7 401.5,-387.7 401.5,-368.7 340.5,-368.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-368.7 340.5,-387.7 401.5,-387.7 401.5,-368.7 340.5,-368.7"/>
 <text text-anchor="start" x="376.7904" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="505.2027" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="523.5,-679.7 523.5,-698.7 573.5,-698.7 573.5,-679.7 523.5,-679.7"/>
 <polygon fill="none" stroke="#000000" points="523.5,-679.7 523.5,-698.7 573.5,-698.7 573.5,-679.7 523.5,-679.7"/>
-<text text-anchor="start" x="526.1904" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="526.1904" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="573.5,-679.7 573.5,-698.7 585.5,-698.7 585.5,-679.7 573.5,-679.7"/>
 <polygon fill="none" stroke="#000000" points="573.5,-679.7 573.5,-698.7 585.5,-698.7 585.5,-679.7 573.5,-679.7"/>
 <text text-anchor="start" x="576.4431" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -248,7 +248,7 @@
 <text text-anchor="start" x="491.5" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="511.5,-433.7 511.5,-452.7 584.5,-452.7 584.5,-433.7 511.5,-433.7"/>
 <polygon fill="none" stroke="#000000" points="511.5,-433.7 511.5,-452.7 584.5,-452.7 584.5,-433.7 511.5,-433.7"/>
-<text text-anchor="start" x="515.4791" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="515.4791" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-433.7 584.5,-452.7 598.5,-452.7 598.5,-433.7 584.5,-433.7"/>
 <polygon fill="none" stroke="#000000" points="584.5,-433.7 584.5,-452.7 598.5,-452.7 598.5,-433.7 584.5,-433.7"/>
 <text text-anchor="start" x="589.3862" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -298,7 +298,7 @@
 <text text-anchor="start" x="455.2027" y="-62.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="473.5,-56.7 473.5,-75.7 545.5,-75.7 545.5,-56.7 473.5,-56.7"/>
 <polygon fill="none" stroke="#000000" points="473.5,-56.7 473.5,-75.7 545.5,-75.7 545.5,-56.7 473.5,-56.7"/>
-<text text-anchor="start" x="476.4896" y="-62.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="476.4896" y="-62.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="545.5,-56.7 545.5,-75.7 635.5,-75.7 635.5,-56.7 545.5,-56.7"/>
 <polygon fill="none" stroke="#000000" points="545.5,-56.7 545.5,-75.7 635.5,-75.7 635.5,-56.7 545.5,-56.7"/>
 <text text-anchor="start" x="616.9053" y="-62.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -429,7 +429,7 @@
 <text text-anchor="start" x="494.2027" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-187.7 512.5,-206.7 584.5,-206.7 584.5,-187.7 512.5,-187.7"/>
 <polygon fill="none" stroke="#000000" points="512.5,-187.7 512.5,-206.7 584.5,-206.7 584.5,-187.7 512.5,-187.7"/>
-<text text-anchor="start" x="515.4896" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="515.4896" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-187.7 584.5,-206.7 596.5,-206.7 596.5,-187.7 584.5,-187.7"/>
 <polygon fill="none" stroke="#000000" points="584.5,-187.7 584.5,-206.7 596.5,-206.7 596.5,-187.7 584.5,-187.7"/>
 <text text-anchor="start" x="587.4431" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot
index 69c8f0d0..9b9b81d1 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot
@@ -40,7 +40,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg
index 09f0db74..374ec146 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg
@@ -74,7 +74,7 @@
 <text text-anchor="start" x="11.5" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-141.7 95.5,-160.7 200.5,-160.7 200.5,-141.7 95.5,-141.7"/>
 <polygon fill="none" stroke="#000000" points="95.5,-141.7 95.5,-160.7 200.5,-160.7 200.5,-141.7 95.5,-141.7"/>
-<text text-anchor="start" x="131.4791" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-141.7 200.5,-160.7 261.5,-160.7 261.5,-141.7 200.5,-141.7"/>
 <polygon fill="none" stroke="#000000" points="200.5,-141.7 200.5,-160.7 261.5,-160.7 261.5,-141.7 200.5,-141.7"/>
 <text text-anchor="start" x="236.7904" y="-147.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot
index c74f9b3c..5015ccf5 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot
@@ -38,7 +38,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -60,7 +60,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -105,7 +105,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -130,7 +130,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -141,7 +141,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -176,7 +176,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg
index 4cacbec8..aca0ef3f 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="495.2027" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="513.5,-761.7 513.5,-780.7 585.5,-780.7 585.5,-761.7 513.5,-761.7"/>
 <polygon fill="none" stroke="#000000" points="513.5,-761.7 513.5,-780.7 585.5,-780.7 585.5,-761.7 513.5,-761.7"/>
-<text text-anchor="start" x="516.4896" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="516.4896" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-761.7 585.5,-780.7 597.5,-780.7 597.5,-761.7 585.5,-761.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-761.7 585.5,-780.7 597.5,-780.7 597.5,-761.7 585.5,-761.7"/>
 <text text-anchor="start" x="588.4431" y="-767.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-368.7 235.5,-387.7 340.5,-387.7 340.5,-368.7 235.5,-368.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-368.7 235.5,-387.7 340.5,-387.7 340.5,-368.7 235.5,-368.7"/>
-<text text-anchor="start" x="271.4791" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-368.7 340.5,-387.7 401.5,-387.7 401.5,-368.7 340.5,-368.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-368.7 340.5,-387.7 401.5,-387.7 401.5,-368.7 340.5,-368.7"/>
 <text text-anchor="start" x="376.7904" y="-374.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="506.2027" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="524.5,-679.7 524.5,-698.7 574.5,-698.7 574.5,-679.7 524.5,-679.7"/>
 <polygon fill="none" stroke="#000000" points="524.5,-679.7 524.5,-698.7 574.5,-698.7 574.5,-679.7 524.5,-679.7"/>
-<text text-anchor="start" x="527.1904" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="527.1904" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="574.5,-679.7 574.5,-698.7 586.5,-698.7 586.5,-679.7 574.5,-679.7"/>
 <polygon fill="none" stroke="#000000" points="574.5,-679.7 574.5,-698.7 586.5,-698.7 586.5,-679.7 574.5,-679.7"/>
 <text text-anchor="start" x="577.4431" y="-685.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -248,7 +248,7 @@
 <text text-anchor="start" x="492.5" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-433.7 512.5,-452.7 585.5,-452.7 585.5,-433.7 512.5,-433.7"/>
 <polygon fill="none" stroke="#000000" points="512.5,-433.7 512.5,-452.7 585.5,-452.7 585.5,-433.7 512.5,-433.7"/>
-<text text-anchor="start" x="516.4791" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="516.4791" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-433.7 585.5,-452.7 599.5,-452.7 599.5,-433.7 585.5,-433.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-433.7 585.5,-452.7 599.5,-452.7 599.5,-433.7 585.5,-433.7"/>
 <text text-anchor="start" x="590.3862" y="-439.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -285,7 +285,7 @@
 <text text-anchor="start" x="495.2027" y="-357.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="513.5,-351.7 513.5,-370.7 585.5,-370.7 585.5,-351.7 513.5,-351.7"/>
 <polygon fill="none" stroke="#000000" points="513.5,-351.7 513.5,-370.7 585.5,-370.7 585.5,-351.7 513.5,-351.7"/>
-<text text-anchor="start" x="516.4896" y="-357.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="516.4896" y="-357.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-351.7 585.5,-370.7 597.5,-370.7 597.5,-351.7 585.5,-351.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-351.7 585.5,-370.7 597.5,-370.7 597.5,-351.7 585.5,-351.7"/>
 <text text-anchor="start" x="588.4431" y="-357.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -429,7 +429,7 @@
 <text text-anchor="start" x="495.2027" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="513.5,-187.7 513.5,-206.7 585.5,-206.7 585.5,-187.7 513.5,-187.7"/>
 <polygon fill="none" stroke="#000000" points="513.5,-187.7 513.5,-206.7 585.5,-206.7 585.5,-187.7 513.5,-187.7"/>
-<text text-anchor="start" x="516.4896" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="516.4896" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-187.7 585.5,-206.7 597.5,-206.7 597.5,-187.7 585.5,-187.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-187.7 585.5,-206.7 597.5,-206.7 597.5,-187.7 585.5,-187.7"/>
 <text text-anchor="start" x="588.4431" y="-193.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot
index 7b1bbcf5..edc06968 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot
@@ -28,7 +28,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg
index d9e83e3f..83e2c5ec 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg
@@ -74,7 +74,7 @@
 <text text-anchor="start" x="11.5" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-37.7 95.5,-56.7 200.5,-56.7 200.5,-37.7 95.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="95.5,-37.7 95.5,-56.7 200.5,-56.7 200.5,-37.7 95.5,-37.7"/>
-<text text-anchor="start" x="131.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-37.7 200.5,-56.7 261.5,-56.7 261.5,-37.7 200.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="200.5,-37.7 200.5,-56.7 261.5,-56.7 261.5,-37.7 200.5,-37.7"/>
 <text text-anchor="start" x="236.7904" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot
index e20e6373..2489bd96 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -92,7 +92,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -117,7 +117,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -163,7 +163,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg
index 1317a2ef..d89a8ef3 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="495.2027" y="-751.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="513.5,-745.7 513.5,-764.7 585.5,-764.7 585.5,-745.7 513.5,-745.7"/>
 <polygon fill="none" stroke="#000000" points="513.5,-745.7 513.5,-764.7 585.5,-764.7 585.5,-745.7 513.5,-745.7"/>
-<text text-anchor="start" x="516.4896" y="-751.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="516.4896" y="-751.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-745.7 585.5,-764.7 597.5,-764.7 597.5,-745.7 585.5,-745.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-745.7 585.5,-764.7 597.5,-764.7 597.5,-745.7 585.5,-745.7"/>
 <text text-anchor="start" x="588.4431" y="-751.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-358.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-352.7 235.5,-371.7 340.5,-371.7 340.5,-352.7 235.5,-352.7"/>
 <polygon fill="none" stroke="#000000" points="235.5,-352.7 235.5,-371.7 340.5,-371.7 340.5,-352.7 235.5,-352.7"/>
-<text text-anchor="start" x="271.4791" y="-358.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-358.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-352.7 340.5,-371.7 401.5,-371.7 401.5,-352.7 340.5,-352.7"/>
 <polygon fill="none" stroke="#000000" points="340.5,-352.7 340.5,-371.7 401.5,-371.7 401.5,-352.7 340.5,-352.7"/>
 <text text-anchor="start" x="376.7904" y="-358.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="506.2027" y="-669.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="524.5,-663.7 524.5,-682.7 574.5,-682.7 574.5,-663.7 524.5,-663.7"/>
 <polygon fill="none" stroke="#000000" points="524.5,-663.7 524.5,-682.7 574.5,-682.7 574.5,-663.7 524.5,-663.7"/>
-<text text-anchor="start" x="527.1904" y="-669.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="527.1904" y="-669.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="574.5,-663.7 574.5,-682.7 586.5,-682.7 586.5,-663.7 574.5,-663.7"/>
 <polygon fill="none" stroke="#000000" points="574.5,-663.7 574.5,-682.7 586.5,-682.7 586.5,-663.7 574.5,-663.7"/>
 <text text-anchor="start" x="577.4431" y="-669.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -248,7 +248,7 @@
 <text text-anchor="start" x="492.5" y="-423.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-417.7 512.5,-436.7 585.5,-436.7 585.5,-417.7 512.5,-417.7"/>
 <polygon fill="none" stroke="#000000" points="512.5,-417.7 512.5,-436.7 585.5,-436.7 585.5,-417.7 512.5,-417.7"/>
-<text text-anchor="start" x="516.4791" y="-423.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="516.4791" y="-423.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-417.7 585.5,-436.7 599.5,-436.7 599.5,-417.7 585.5,-417.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-417.7 585.5,-436.7 599.5,-436.7 599.5,-417.7 585.5,-417.7"/>
 <text text-anchor="start" x="590.3862" y="-423.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -285,7 +285,7 @@
 <text text-anchor="start" x="495.2027" y="-341.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="513.5,-335.7 513.5,-354.7 585.5,-354.7 585.5,-335.7 513.5,-335.7"/>
 <polygon fill="none" stroke="#000000" points="513.5,-335.7 513.5,-354.7 585.5,-354.7 585.5,-335.7 513.5,-335.7"/>
-<text text-anchor="start" x="516.4896" y="-341.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="516.4896" y="-341.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-335.7 585.5,-354.7 597.5,-354.7 597.5,-335.7 585.5,-335.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-335.7 585.5,-354.7 597.5,-354.7 597.5,-335.7 585.5,-335.7"/>
 <text text-anchor="start" x="588.4431" y="-341.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -396,7 +396,7 @@
 <text text-anchor="start" x="495.2027" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="513.5,-37.7 513.5,-56.7 585.5,-56.7 585.5,-37.7 513.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="513.5,-37.7 513.5,-56.7 585.5,-56.7 585.5,-37.7 513.5,-37.7"/>
-<text text-anchor="start" x="516.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="516.4896" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="585.5,-37.7 585.5,-56.7 597.5,-56.7 597.5,-37.7 585.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="585.5,-37.7 585.5,-56.7 597.5,-56.7 597.5,-37.7 585.5,-37.7"/>
 <text text-anchor="start" x="588.4431" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot
index 37fb845e..0469ed47 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot
@@ -27,7 +27,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -39,7 +39,7 @@ digraph "oneDegreeRelationshipsDiagram" {
       <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD><TD PORT="url.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg
index 69f58059..d4d6a5f0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg
@@ -34,7 +34,7 @@
 <text text-anchor="start" x="315.2027" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="333.5,-78.7 333.5,-97.7 405.5,-97.7 405.5,-78.7 333.5,-78.7"/>
 <polygon fill="none" stroke="#000000" points="333.5,-78.7 333.5,-97.7 405.5,-97.7 405.5,-78.7 333.5,-78.7"/>
-<text text-anchor="start" x="336.4896" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="336.4896" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="405.5,-78.7 405.5,-97.7 495.5,-97.7 495.5,-78.7 405.5,-78.7"/>
 <polygon fill="none" stroke="#000000" points="405.5,-78.7 405.5,-97.7 495.5,-97.7 495.5,-78.7 405.5,-78.7"/>
 <text text-anchor="start" x="476.9053" y="-84.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
@@ -69,7 +69,7 @@
 <text text-anchor="start" x="11.5" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="95.5,-37.7 95.5,-56.7 200.5,-56.7 200.5,-37.7 95.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="95.5,-37.7 95.5,-56.7 200.5,-56.7 200.5,-37.7 95.5,-37.7"/>
-<text text-anchor="start" x="131.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="131.4791" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="200.5,-37.7 200.5,-56.7 261.5,-56.7 261.5,-37.7 200.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="200.5,-37.7 200.5,-56.7 261.5,-56.7 261.5,-37.7 200.5,-37.7"/>
 <text text-anchor="start" x="236.7904" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot
index 5c07bc2c..92ad50db 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot
@@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>acronyms</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.307 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">143.341 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/acronyms.html"
     target="_top"
@@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -92,7 +92,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>oa_duplicates</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.046 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">219.113 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/oa_duplicates.html"
     target="_top"
@@ -117,7 +117,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">type</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="country" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="232" HEIGHT="16">country</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
@@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>other_ids</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">361.455 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">344.848 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/other_ids.html"
     target="_top"
@@ -162,7 +162,7 @@ digraph "twoDegreesRelationshipsDiagram" {
       <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>urls</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">id</TD></TR></TABLE></TD><TD PORT="id.type" ALIGN="LEFT">text[2147483647]</TD></TR>
       <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="22" HEIGHT="16">url</TD></TR></TABLE></TD><TD PORT="url.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.098 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">216.223 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/urls.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg
index 98198d6d..8e14ddcc 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="494.2027" y="-729.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-723.2 512.5,-742.2 584.5,-742.2 584.5,-723.2 512.5,-723.2"/>
 <polygon fill="none" stroke="#000000" points="512.5,-723.2 512.5,-742.2 584.5,-742.2 584.5,-723.2 512.5,-723.2"/>
-<text text-anchor="start" x="515.4896" y="-729.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.307 rows</text>
+<text text-anchor="start" x="515.4896" y="-729.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">143.341 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-723.2 584.5,-742.2 596.5,-742.2 596.5,-723.2 584.5,-723.2"/>
 <polygon fill="none" stroke="#000000" points="584.5,-723.2 584.5,-742.2 596.5,-742.2 596.5,-723.2 584.5,-723.2"/>
 <text text-anchor="start" x="587.4431" y="-729.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -60,7 +60,7 @@
 <text text-anchor="start" x="151.5" y="-336.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="235.5,-330.2 235.5,-349.2 340.5,-349.2 340.5,-330.2 235.5,-330.2"/>
 <polygon fill="none" stroke="#000000" points="235.5,-330.2 235.5,-349.2 340.5,-349.2 340.5,-330.2 235.5,-330.2"/>
-<text text-anchor="start" x="271.4791" y="-336.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="271.4791" y="-336.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="340.5,-330.2 340.5,-349.2 401.5,-349.2 401.5,-330.2 340.5,-330.2"/>
 <polygon fill="none" stroke="#000000" points="340.5,-330.2 340.5,-349.2 401.5,-349.2 401.5,-330.2 340.5,-330.2"/>
 <text text-anchor="start" x="376.7904" y="-336.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
@@ -150,7 +150,7 @@
 <text text-anchor="start" x="505.2027" y="-647.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="523.5,-641.2 523.5,-660.2 573.5,-660.2 573.5,-641.2 523.5,-641.2"/>
 <polygon fill="none" stroke="#000000" points="523.5,-641.2 523.5,-660.2 573.5,-660.2 573.5,-641.2 523.5,-641.2"/>
-<text text-anchor="start" x="526.1904" y="-647.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="526.1904" y="-647.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="573.5,-641.2 573.5,-660.2 585.5,-660.2 585.5,-641.2 573.5,-641.2"/>
 <polygon fill="none" stroke="#000000" points="573.5,-641.2 573.5,-660.2 585.5,-660.2 585.5,-641.2 573.5,-641.2"/>
 <text text-anchor="start" x="576.4431" y="-647.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -248,7 +248,7 @@
 <text text-anchor="start" x="491.5" y="-401.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="511.5,-395.2 511.5,-414.2 584.5,-414.2 584.5,-395.2 511.5,-395.2"/>
 <polygon fill="none" stroke="#000000" points="511.5,-395.2 511.5,-414.2 584.5,-414.2 584.5,-395.2 511.5,-395.2"/>
-<text text-anchor="start" x="515.4791" y="-401.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.046 rows</text>
+<text text-anchor="start" x="515.4791" y="-401.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">219.113 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-395.2 584.5,-414.2 598.5,-414.2 598.5,-395.2 584.5,-395.2"/>
 <polygon fill="none" stroke="#000000" points="584.5,-395.2 584.5,-414.2 598.5,-414.2 598.5,-395.2 584.5,-395.2"/>
 <text text-anchor="start" x="589.3862" y="-401.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -285,7 +285,7 @@
 <text text-anchor="start" x="494.2027" y="-319.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="512.5,-313.2 512.5,-332.2 584.5,-332.2 584.5,-313.2 512.5,-313.2"/>
 <polygon fill="none" stroke="#000000" points="512.5,-313.2 512.5,-332.2 584.5,-332.2 584.5,-313.2 512.5,-313.2"/>
-<text text-anchor="start" x="515.4896" y="-319.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">361.455 rows</text>
+<text text-anchor="start" x="515.4896" y="-319.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">344.848 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="584.5,-313.2 584.5,-332.2 596.5,-332.2 596.5,-313.2 584.5,-313.2"/>
 <polygon fill="none" stroke="#000000" points="584.5,-313.2 584.5,-332.2 596.5,-332.2 596.5,-313.2 584.5,-313.2"/>
 <text text-anchor="start" x="587.4431" y="-319.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -390,7 +390,7 @@
 <text text-anchor="start" x="455.2027" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 1</text>
 <polygon fill="#ffffff" stroke="transparent" points="473.5,-40.2 473.5,-59.2 545.5,-59.2 545.5,-40.2 473.5,-40.2"/>
 <polygon fill="none" stroke="#000000" points="473.5,-40.2 473.5,-59.2 545.5,-59.2 545.5,-40.2 473.5,-40.2"/>
-<text text-anchor="start" x="476.4896" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.098 rows</text>
+<text text-anchor="start" x="476.4896" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">216.223 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="545.5,-40.2 545.5,-59.2 635.5,-59.2 635.5,-40.2 545.5,-40.2"/>
 <polygon fill="none" stroke="#000000" points="545.5,-40.2 545.5,-59.2 635.5,-59.2 635.5,-40.2 545.5,-40.2"/>
 <text text-anchor="start" x="616.9053" y="-46.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">0 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot
index b2fcb491..935e3437 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot
@@ -39,7 +39,7 @@ digraph "twoDegreesRelationshipsDiagram" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>organizations</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg
index 4d368d77..2418ce40 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="333.2027" y="-64.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="351.5,-58.7 351.5,-77.7 423.5,-77.7 423.5,-58.7 351.5,-58.7"/>
 <polygon fill="none" stroke="#000000" points="351.5,-58.7 351.5,-77.7 423.5,-77.7 423.5,-58.7 351.5,-58.7"/>
-<text text-anchor="start" x="354.4896" y="-64.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="354.4896" y="-64.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="423.5,-58.7 423.5,-77.7 450.5,-77.7 450.5,-58.7 423.5,-58.7"/>
 <polygon fill="none" stroke="#000000" points="423.5,-58.7 423.5,-77.7 450.5,-77.7 450.5,-58.7 423.5,-58.7"/>
 <text text-anchor="start" x="426.1452" y="-64.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot
index f90b09e0..27f6c906 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot
@@ -43,7 +43,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -54,7 +54,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>organizations</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg
index 4dc909f0..2cf5cdeb 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="382.2027" y="-179.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="400.5,-173.7 400.5,-192.7 450.5,-192.7 450.5,-173.7 400.5,-173.7"/>
 <polygon fill="none" stroke="#000000" points="400.5,-173.7 400.5,-192.7 450.5,-192.7 450.5,-173.7 400.5,-173.7"/>
-<text text-anchor="start" x="403.1904" y="-179.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="403.1904" y="-179.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="450.5,-173.7 450.5,-192.7 462.5,-192.7 462.5,-173.7 450.5,-173.7"/>
 <polygon fill="none" stroke="#000000" points="450.5,-173.7 450.5,-192.7 462.5,-192.7 462.5,-173.7 450.5,-173.7"/>
 <text text-anchor="start" x="453.4431" y="-179.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -85,7 +85,7 @@
 <text text-anchor="start" x="153.7027" y="-90.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="172,-84.7 172,-103.7 244,-103.7 244,-84.7 172,-84.7"/>
 <polygon fill="none" stroke="#000000" points="172,-84.7 172,-103.7 244,-103.7 244,-84.7 172,-84.7"/>
-<text text-anchor="start" x="174.9896" y="-90.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="174.9896" y="-90.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="244,-84.7 244,-103.7 271,-103.7 271,-84.7 244,-84.7"/>
 <polygon fill="none" stroke="#000000" points="244,-84.7 244,-103.7 271,-103.7 271,-84.7 244,-84.7"/>
 <text text-anchor="start" x="246.6452" y="-90.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot
index 7faa478b..6a8d4562 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot
@@ -28,7 +28,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg
index 94982c30..61ee770d 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="390.2027" y="-233.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="408.5,-227.2 408.5,-246.2 458.5,-246.2 458.5,-227.2 408.5,-227.2"/>
 <polygon fill="none" stroke="#000000" points="408.5,-227.2 408.5,-246.2 458.5,-246.2 458.5,-227.2 408.5,-227.2"/>
-<text text-anchor="start" x="411.1904" y="-233.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="411.1904" y="-233.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="458.5,-227.2 458.5,-246.2 470.5,-246.2 470.5,-227.2 458.5,-227.2"/>
 <polygon fill="none" stroke="#000000" points="458.5,-227.2 458.5,-246.2 470.5,-246.2 470.5,-227.2 458.5,-227.2"/>
 <text text-anchor="start" x="461.4431" y="-233.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot
index 0255579c..59d73200 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot
@@ -31,7 +31,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg
index 3134af58..8f2eab64 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg
@@ -36,7 +36,7 @@
 <text text-anchor="start" x="404.5" y="-265.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="423.5,-259.2 423.5,-278.2 473.5,-278.2 473.5,-259.2 423.5,-259.2"/>
 <polygon fill="none" stroke="#000000" points="423.5,-259.2 423.5,-278.2 473.5,-278.2 473.5,-259.2 423.5,-259.2"/>
-<text text-anchor="start" x="426.1904" y="-265.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="426.1904" y="-265.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="473.5,-259.2 473.5,-278.2 486.5,-278.2 486.5,-259.2 473.5,-259.2"/>
 <polygon fill="none" stroke="#000000" points="473.5,-259.2 473.5,-278.2 486.5,-278.2 486.5,-259.2 473.5,-259.2"/>
 <text text-anchor="start" x="477.3862" y="-265.3" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot
index 3b58740b..514e6a21 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot
@@ -45,7 +45,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
       <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">id</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="email" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="64" HEIGHT="16">email</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
@@ -56,7 +56,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>organizations</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.617 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">497.673 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">12 &gt;</TD></TR>
     </TABLE>>
     URL="../../tables/organizations.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg
index f2928e53..1be56b59 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg
@@ -36,7 +36,7 @@
 <text text-anchor="start" x="404.5" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="423.5,-37.7 423.5,-56.7 473.5,-56.7 473.5,-37.7 423.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="423.5,-37.7 423.5,-56.7 473.5,-56.7 473.5,-37.7 423.5,-37.7"/>
-<text text-anchor="start" x="426.1904" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="426.1904" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="473.5,-37.7 473.5,-56.7 486.5,-56.7 486.5,-37.7 473.5,-37.7"/>
 <polygon fill="none" stroke="#000000" points="473.5,-37.7 473.5,-56.7 486.5,-56.7 486.5,-37.7 473.5,-37.7"/>
 <text text-anchor="start" x="477.3862" y="-43.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
@@ -110,7 +110,7 @@
 <text text-anchor="start" x="186.7027" y="-80.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="205,-74.7 205,-93.7 277,-93.7 277,-74.7 205,-74.7"/>
 <polygon fill="none" stroke="#000000" points="205,-74.7 205,-93.7 277,-93.7 277,-74.7 205,-74.7"/>
-<text text-anchor="start" x="207.9896" y="-80.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.617 rows</text>
+<text text-anchor="start" x="207.9896" y="-80.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">497.673 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="277,-74.7 277,-93.7 304,-93.7 304,-74.7 277,-74.7"/>
 <polygon fill="none" stroke="#000000" points="277,-74.7 277,-93.7 304,-93.7 304,-74.7 277,-74.7"/>
 <text text-anchor="start" x="279.6452" y="-80.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">12 &gt;</text>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot
index 47bdc936..07186cfe 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot
@@ -28,7 +28,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
       <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT"><B>journal</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
       <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">320 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">336 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
     </TABLE>>
     URL="../../tables/journal.html"
     target="_top"
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg
index a64de07e..196c4ce4 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg
@@ -26,7 +26,7 @@
 <text text-anchor="start" x="347.2027" y="-305.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">&lt; 2</text>
 <polygon fill="#ffffff" stroke="transparent" points="365.5,-299.7 365.5,-318.7 415.5,-318.7 415.5,-299.7 365.5,-299.7"/>
 <polygon fill="none" stroke="#000000" points="365.5,-299.7 365.5,-318.7 415.5,-318.7 415.5,-299.7 365.5,-299.7"/>
-<text text-anchor="start" x="368.1904" y="-305.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">320 rows</text>
+<text text-anchor="start" x="368.1904" y="-305.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000">336 rows</text>
 <polygon fill="#ffffff" stroke="transparent" points="415.5,-299.7 415.5,-318.7 427.5,-318.7 427.5,-299.7 415.5,-299.7"/>
 <polygon fill="none" stroke="#000000" points="415.5,-299.7 415.5,-318.7 427.5,-318.7 427.5,-299.7 415.5,-299.7"/>
 <text text-anchor="start" x="418.4431" y="-305.8" font-family="Helvetica,sans-Serif" font-size="11.00" fill="#000000"> &#160;</text>
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 a03501d1..6cb2c2cc 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 mar apr 27 08:22 CEST 2021</p>
+                                <p>Generated on mer mag 05 11:42 CEST 2021</p>
                             </div>
                         </div>
                     </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">185</span>
+                                    <span class="info-box-number">189</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -204,7 +204,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">19</td>
-                                        <td class="detail" align="right">236350</td>
+                                        <td class="detail" align="right">236394</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -240,7 +240,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">1</td>
                                         <td class="detail" align="right">2</td>
-                                        <td class="detail" align="right">216098</td>
+                                        <td class="detail" align="right">216223</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -249,7 +249,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">2</td>
                                         <td class="detail" align="right">3</td>
-                                        <td class="detail" align="right">361455</td>
+                                        <td class="detail" align="right">344848</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -258,7 +258,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">2</td>
                                         <td class="detail" align="right">6</td>
-                                        <td class="detail" align="right">320</td>
+                                        <td class="detail" align="right">336</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -267,7 +267,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">1</td>
                                         <td class="detail" align="right">2</td>
-                                        <td class="detail" align="right">143307</td>
+                                        <td class="detail" align="right">143341</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -285,7 +285,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">2</td>
-                                        <td class="detail" align="right">497619</td>
+                                        <td class="detail" align="right">497675</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -294,7 +294,7 @@
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">2</td>
                                         <td class="detail" align="right">8</td>
-                                        <td class="detail" align="right">219046</td>
+                                        <td class="detail" align="right">219113</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -330,7 +330,7 @@
                                         <td class="detail" align="right">12</td>
                                         <td class="detail" align="right">2</td>
                                         <td class="detail" align="right">22</td>
-                                        <td class="detail" align="right">497617</td>
+                                        <td class="detail" align="right">497673</td>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
@@ -428,7 +428,7 @@
                                         <td class="detail"><a href="tables/organizations_simple_view.html">organizations_simple_view</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">12</td>
                                         <td class="detail" align="right">0</td>
                                         <td class="detail" align="right">View</td>
                                         <td class="comment detail" style="display: table-cell;"></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 53ffed89..151ad151 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,5 +1,5 @@
-date=2021-04-27 08:22:28+0200
-os=Mac OS X 11.2.3
+date=2021-05-05 11:42:08+0200
+os=Mac OS X 11.3.1
 schemaspy-version=6.1.0
 schemaspy-build=6.1.0.41 2019-09-17 21:52:57
 diagramImplementation=Viz.js 1.7.1 (Graphviz 2.40.1, Expat 2.1.0, Emscripten 1.37.9)
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 4d0080ff..86f6117a 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
@@ -5,7 +5,7 @@
       <sequence increment="1" name="organizations_id_seq" startValue="1"/>
    </sequences>
    <tables>
-      <table name="acronyms" numRows="143307" remarks="" schema="public" type="TABLE">
+      <table name="acronyms" numRows="143341" 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="acronyms_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="organizations"/>
          </column>
@@ -61,7 +61,7 @@
             <column ascending="true" name="val"/>
          </index>
       </table>
-      <table name="journal" numRows="320" remarks="" schema="public" type="TABLE">
+      <table name="journal" numRows="336" remarks="" schema="public" type="TABLE">
          <column autoUpdated="true" defaultValue="nextval('journal_jid_seq'::regclass)" digits="0" id="0" name="jid" nullable="false" remarks="" size="10" type="serial" typeCode="4"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12">
             <parent column="id" foreignKey="journal_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="organizations"/>
@@ -131,7 +131,7 @@
             <column ascending="true" name="idgroup"/>
          </index>
       </table>
-      <table name="oa_duplicates" numRows="219046" remarks="" schema="public" type="TABLE">
+      <table name="oa_duplicates" numRows="219113" remarks="" schema="public" type="TABLE">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="local_id" nullable="false" remarks="" size="2147483647" type="text" typeCode="12">
             <parent column="id" foreignKey="oa_duplicates_local_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="organizations"/>
          </column>
@@ -176,7 +176,7 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="18" name="ec_smevalidated" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="19" name="ec_nutscode" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
       </table>
-      <table name="org_index_search" numRows="497619" remarks="" schema="public" type="TABLE">
+      <table name="org_index_search" numRows="497675" 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"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="txt" nullable="true" remarks="" size="2147483647" type="tsvector" typeCode="1111"/>
          <primaryKey column="id" sequenceNumberInPK="1"/>
@@ -197,7 +197,7 @@
             <column ascending="true" name="val"/>
          </index>
       </table>
-      <table name="organizations" numRows="497617" remarks="" schema="public" type="TABLE">
+      <table name="organizations" numRows="497673" remarks="" schema="public" type="TABLE">
          <column autoUpdated="true" defaultValue="('openorgs____::'::text || lpad((nextval('organizations_id_seq'::regclass))::text, 10, '0'::text))" digits="0" id="0" name="id" nullable="false" remarks="" size="2147483647" type="text" typeCode="12">
             <child column="id" foreignKey="acronyms_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="acronyms"/>
             <child column="id" foreignKey="journal_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="journal"/>
@@ -259,7 +259,7 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="n_conflicts" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="note" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
       </table>
-      <table name="organizations_simple_view" numRows="0" remarks="" schema="public" type="VIEW" viewSql=" SELECT org.id,&#10;    org.name,&#10;    org.type,&#10;    org.city,&#10;    org.country,&#10;    org.status,&#10;    array_remove(array_agg(DISTINCT a.acronym), NULL::text) AS acronyms,&#10;    array_remove(array_agg(DISTINCT u.url), NULL::text) AS urls&#10;   FROM ((organizations org&#10;     LEFT JOIN acronyms a ON ((org.id = a.id)))&#10;     LEFT JOIN urls u ON ((org.id = u.id)))&#10;  GROUP BY org.id, org.name, org.type, org.city, org.country, org.status;">
+      <table name="organizations_simple_view" numRows="0" remarks="" schema="public" type="VIEW" viewSql=" SELECT org.id,&#10;    org.name,&#10;    org.type,&#10;    org.city,&#10;    org.country,&#10;    org.status,&#10;    array_remove(array_agg(DISTINCT a.acronym), NULL::text) AS acronyms,&#10;    array_remove(array_agg(DISTINCT u.url), NULL::text) AS urls,&#10;    count(DISTINCT d1.oa_original_id) FILTER (WHERE (d1.reltype = 'is_similar'::text)) AS n_similar_dups,&#10;    count(DISTINCT d1.oa_original_id) FILTER (WHERE (d1.reltype = 'suggested'::text)) AS n_suggested_dups,&#10;    count(DISTINCT d1.oa_original_id) FILTER (WHERE (d1.reltype = 'is_different'::text)) AS n_different_dups,&#10;    ((org.status = 'raw'::text) AND (NOT ('is_similar'::text = ANY (array_agg(d2.reltype))))) AS candidate_dup&#10;   FROM ((((organizations org&#10;     LEFT JOIN acronyms a ON ((org.id = a.id)))&#10;     LEFT JOIN urls u ON ((org.id = u.id)))&#10;     LEFT JOIN oa_duplicates d1 ON ((org.id = d1.local_id)))&#10;     LEFT JOIN oa_duplicates d2 ON ((org.id = d2.oa_original_id)))&#10;  GROUP BY org.id, org.name, org.type, org.city, org.country, org.status;">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="type" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
@@ -268,6 +268,10 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="status" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="acronyms" nullable="true" remarks="" size="2147483647" type="_text" typeCode="2003"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="urls" nullable="true" remarks="" size="2147483647" type="_text" typeCode="2003"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="n_similar_dups" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="n_suggested_dups" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="10" name="n_different_dups" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="11" name="candidate_dup" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
       </table>
       <table name="organizations_view" numRows="0" remarks="" schema="public" type="VIEW" viewSql=" SELECT org.id,&#10;    org.name,&#10;    org.type,&#10;    org.lat,&#10;    org.lng,&#10;    org.city,&#10;    org.country,&#10;    org.status,&#10;    org.ec_legalbody,&#10;    org.ec_legalperson,&#10;    org.ec_nonprofit,&#10;    org.ec_researchorganization,&#10;    org.ec_highereducation,&#10;    org.ec_internationalorganizationeurinterests,&#10;    org.ec_internationalorganization,&#10;    org.ec_enterprise,&#10;    org.ec_smevalidated,&#10;    org.ec_nutscode,&#10;    COALESCE(jsonb_agg(DISTINCT jsonb_build_object('id', oid.otherid, 'type', oid.type)) FILTER (WHERE (oid.otherid IS NOT NULL)), '[]'::jsonb) AS other_ids,&#10;    COALESCE(jsonb_agg(DISTINCT jsonb_build_object('name', n.name, 'lang', n.lang)) FILTER (WHERE (n.name IS NOT NULL)), '[]'::jsonb) AS other_names,&#10;    COALESCE(jsonb_agg(DISTINCT a.acronym) FILTER (WHERE (a.acronym IS NOT NULL)), '[]'::jsonb) AS acronyms,&#10;    COALESCE(jsonb_agg(DISTINCT u.url) FILTER (WHERE (u.url IS NOT NULL)), '[]'::jsonb) AS urls,&#10;    COALESCE(jsonb_agg(DISTINCT jsonb_build_object('relatedOrgId', relorg.id, 'relatedOrgName', relorg.name, 'type', r.reltype)) FILTER (WHERE (relorg.id IS NOT NULL)), '[]'::jsonb) AS relations&#10;   FROM ((((((organizations org&#10;     LEFT JOIN other_ids oid ON ((org.id = oid.id)))&#10;     LEFT JOIN other_names n ON ((org.id = n.id)))&#10;     LEFT JOIN acronyms a ON ((org.id = a.id)))&#10;     LEFT JOIN urls u ON ((org.id = u.id)))&#10;     LEFT JOIN relationships r ON ((org.id = r.id1)))&#10;     LEFT JOIN organizations relorg ON ((relorg.id = r.id2)))&#10;  GROUP BY org.id, org.name, org.type, org.lat, org.lng, org.city, org.country, org.status, org.ec_legalbody, org.ec_legalperson, org.ec_nonprofit, org.ec_researchorganization, org.ec_highereducation, org.ec_internationalorganizationeurinterests, org.ec_internationalorganization, org.ec_enterprise, org.ec_smevalidated, org.ec_nutscode;">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
@@ -294,7 +298,7 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="21" name="urls" nullable="true" remarks="" size="2147483647" type="jsonb" typeCode="1111"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="22" name="relations" nullable="true" remarks="" size="2147483647" type="jsonb" typeCode="1111"/>
       </table>
-      <table name="other_ids" numRows="361455" remarks="" schema="public" type="TABLE">
+      <table name="other_ids" numRows="344848" 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="other_ids_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="organizations"/>
          </column>
@@ -364,7 +368,7 @@
          <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="n_conflicts" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="n_pending_orgs" nullable="true" remarks="" size="19" type="int8" typeCode="-5"/>
       </table>
-      <table name="tmp_dedup_events" numRows="236350" remarks="" schema="public" type="TABLE">
+      <table name="tmp_dedup_events" numRows="236394" remarks="" schema="public" type="TABLE">
          <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="ec_enterprise" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="ec_highereducation" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="ec_internationalorganization" nullable="true" remarks="" size="1" type="bool" typeCode="-7"/>
@@ -385,7 +389,7 @@
          <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="urls" numRows="216098" remarks="" schema="public" type="TABLE">
+      <table name="urls" numRows="216223" 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"/>
          </column>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html
index f4542bed..d9c95336 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>acronyms</h1><p><span id="recordNumber">143307</span> rows</p><br />
+                    <h1>acronyms</h1><p><span id="recordNumber">143341</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html
index 78aa7aa1..e35b8ff5 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>journal</h1><p><span id="recordNumber">320</span> rows</p><br />
+                    <h1>journal</h1><p><span id="recordNumber">336</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html
index 1da354c6..8d1bfe21 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>oa_duplicates</h1><p><span id="recordNumber">219046</span> rows</p><br />
+                    <h1>oa_duplicates</h1><p><span id="recordNumber">219113</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html
index ee83dd47..ceb22b5c 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>org_index_search</h1><p><span id="recordNumber">497619</span> rows</p><br />
+                    <h1>org_index_search</h1><p><span id="recordNumber">497675</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html
index 593cf95d..25a68e22 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>organizations</h1><p><span id="recordNumber">497617</span> rows</p><br />
+                    <h1>organizations</h1><p><span id="recordNumber">497673</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html
index ec8ced30..2b1cc72f 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html
@@ -238,6 +238,74 @@
                                     </td>
                                     <td></td>
                                 </tr>
+                                <tr>
+                                    <td><span id="n_similar_dups">n_similar_dups</span></td>
+                                    <td>int8</td>
+                                    <td>19</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="n_suggested_dups">n_suggested_dups</span></td>
+                                    <td>int8</td>
+                                    <td>19</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="n_different_dups">n_different_dups</span></td>
+                                    <td>int8</td>
+                                    <td>19</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td><span id="candidate_dup">candidate_dup</span></td>
+                                    <td>bool</td>
+                                    <td>1</td>
+                                    <td title='nullable'>√</td>
+                                    <td title=''></td>
+                                    <td>null</td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table border='0' cellspacing='0' cellpadding='0'>
+                                        </table>
+                                    </td>
+                                    <td></td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -252,7 +320,7 @@
                             </div>
                         </div>
                         <div class="box-body">
-                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">SELECT org.id,&#10;    org.name,&#10;    org.type,&#10;    org.city,&#10;    org.country,&#10;    org.status,&#10;    array_remove(array_agg(DISTINCT a.acronym), NULL::text) AS acronyms,&#10;    array_remove(array_agg(DISTINCT u.url), NULL::text) AS urls&#10;   FROM ((organizations org&#10;     LEFT JOIN acronyms a ON ((org.id = a.id)))&#10;     LEFT JOIN urls u ON ((org.id = u.id)))&#10;  GROUP BY org.id, org.name, org.type, org.city, org.country, org.status;</textarea>
+                            <textarea id="sql-script-codemirror" name="sql-script-codemirror" rows="" style="display: none;">SELECT org.id,&#10;    org.name,&#10;    org.type,&#10;    org.city,&#10;    org.country,&#10;    org.status,&#10;    array_remove(array_agg(DISTINCT a.acronym), NULL::text) AS acronyms,&#10;    array_remove(array_agg(DISTINCT u.url), NULL::text) AS urls,&#10;    count(DISTINCT d1.oa_original_id) FILTER (WHERE (d1.reltype = &#39;is_similar&#39;::text)) AS n_similar_dups,&#10;    count(DISTINCT d1.oa_original_id) FILTER (WHERE (d1.reltype = &#39;suggested&#39;::text)) AS n_suggested_dups,&#10;    count(DISTINCT d1.oa_original_id) FILTER (WHERE (d1.reltype = &#39;is_different&#39;::text)) AS n_different_dups,&#10;    ((org.status = &#39;raw&#39;::text) AND (NOT (&#39;is_similar&#39;::text = ANY (array_agg(d2.reltype))))) AS candidate_dup&#10;   FROM ((((organizations org&#10;     LEFT JOIN acronyms a ON ((org.id = a.id)))&#10;     LEFT JOIN urls u ON ((org.id = u.id)))&#10;     LEFT JOIN oa_duplicates d1 ON ((org.id = d1.local_id)))&#10;     LEFT JOIN oa_duplicates d2 ON ((org.id = d2.oa_original_id)))&#10;  GROUP BY org.id, org.name, org.type, org.city, org.country, org.status;</textarea>
                             <div style="padding-top: 5px;"><hr></div>
                             <div class="box box-solid">
                                 <div class="box-header with-border">
@@ -265,6 +333,7 @@
                                         <li><a href="acronyms.html">acronyms</a></li>
                                         <li><a href="urls.html">urls</a></li>
                                         <li><a href="organizations.html">organizations</a></li>
+                                        <li><a href="oa_duplicates.html">oa_duplicates</a></li>
                                     </ul>
                                 </div><!-- /.box-body -->
                             </div>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html
index e287f728..06af3e20 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>other_ids</h1><p><span id="recordNumber">361455</span> rows</p><br />
+                    <h1>other_ids</h1><p><span id="recordNumber">344848</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html
index 6b278196..d8e4fcb3 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>tmp_dedup_events</h1><p><span id="recordNumber">236350</span> rows</p><br />
+                    <h1>tmp_dedup_events</h1><p><span id="recordNumber">236394</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html
index 1a790151..335b7e9d 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html
@@ -73,7 +73,7 @@
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <h1>urls</h1><p><span id="recordNumber">216098</span> rows</p><br />
+                    <h1>urls</h1><p><span id="recordNumber">216223</span> rows</p><br />
                 </section>
                 <!-- Main content -->
                 <section class="content">
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html
index 16c37184..12373cd9 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html
@@ -2,4 +2,5 @@
 	orgs="orgs" 
 	prev-function="prev()" 
 	next-function="next()"
-	show-status="1"></org-results-page>
+	show-status="1"
+	show-n-dups="1"></org-results-page>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html
index a6ae7870..cd80bf1e 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html
@@ -2,4 +2,5 @@
 	orgs="orgs" 
 	prev-function="prev()" 
 	next-function="next()"
-	show-status="1"></org-results-page>
+	show-status="1"
+	show-n-dups="1"></org-results-page>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html
index 28f644b5..9f62420f 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html
@@ -2,4 +2,5 @@
 	orgs="orgs" 
 	prev-function="prev()" 
 	next-function="next()"
-	show-status="1"></org-results-page>
+	show-status="1"
+	show-n-dups="1"></org-results-page>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html
index df344165..a491dcef 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html
@@ -14,7 +14,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr class="d-flex" ng-repeat="sr in duplicates" ng-hide="sr.oaOriginalId.startsWith('pending_org_::')">
+			<tr class="d-flex" ng-repeat="sr in duplicates">
 				<td class="col-4 pl-3">{{sr.oaName}}
 					<span class="small" ng-repeat="oid in sr.otherIdentifiers">
 						<br /><b>PID ({{oid.type}}): </b>{{oid.id}}
@@ -68,4 +68,4 @@
 	
 </div>
 
-<select-org-modal modal-id="addDuplicateModal" selected-org="newDuplicate" filter-status="suggested" on-select="addDuplicate()"></select-org-modal>
+<select-org-modal modal-id="addDuplicateModal" selected-org="newDuplicate" filter-status="candidate_dup" on-select="addDuplicate()"></select-org-modal>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html
index e1006a3b..8e081fe6 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html
@@ -40,8 +40,9 @@
 		<thead class="thead-light">
 			<tr class="d-flex">
 				<th class="col-6">Organization name</th>
-				<th class="col-4">Place</th>
+				<th ng-class="{'col-3' : showNDups, 'col-4' : !showNDups }">Place</th>
 				<th class="col-1 text-center">Acronyms</th>
+				<th class="col-1 text-center" ng-if="showNDups"># Dups<br /><small>diff/sugg/sim</small></th>
 				<th class="col-1 text-right">Type</th>
 			</tr>
 		</thead>
@@ -52,8 +53,9 @@
 					<a ng-if="mode != 'select-modal'" href="#!/edit/0/{{o.id}}" title="{{o.id}}">{{o.name}}</a>
 					<span class="badge badge-warning" ng-if="showStatus && o.status != 'approved'">{{o.status}}</span>
 				</td>
-				<td class="col-4"><img ng-src="resources/images/flags/{{o.country}}.gif" /> {{o.city || '-'}}, {{o.country}}</td>
+				<td ng-class="{'col-3' : showNDups, 'col-4' : !showNDups }"><img ng-src="resources/images/flags/{{o.country}}.gif" /> {{o.city || '-'}}, {{o.country}}</td>
 				<td class="col-1 text-center">{{o.acronyms.join()}}</td>
+				<th class="col-1 text-center" ng-if="showNDups">{{o.nDifferentDups ? o.nDifferentDups  : '-'}} / {{o.nSuggestedDups ? o.nSuggestedDups : '-'}} / {{o.nSimilarDups ? o.nSimilarDups : '-'}}</th>
 				<td class="col-1 text-right">{{o.type}}</td>
 			</tr>
 		</tbody>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
index 6d35ce79..aa1f04f2 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
@@ -213,7 +213,8 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route) {
 			'onSelect'      : '&',
 			'selectedOrg'   : '=',
 			'mode'          : '@',
-			'showStatus'    : '@'
+			'showStatus'    : '@',
+			'showNDups'     : '@'
 		},
 		templateUrl: 'resources/html/parts/org_results_page.html',
 		link: function(scope, element, attrs, ctrl) {
@@ -270,14 +271,6 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) {
 					'createdBy'       : currentUser(),
 					'relType'         : 'is_similar'
 				});
-				
-				// I find and copy the duplicates of the selected org 
-				call_http_get($http, 'api/organizations/duplicates?id=' + scope.newDuplicate.id, function(res) {
-					angular.forEach(res.data, function(dup) {
-						dup.localId = scope.orgId;
-						scope.duplicates.push(dup);
-					});
-				});
 			}
 		}
      }