diff --git a/migration/20.03/2003.sql b/migration/20.03/2003.sql
index dc7ed61331834054793d89cc800067187cd9bd03..70dca9fad18011cdc777e0aaac6e8df3ce257502 100644
--- a/migration/20.03/2003.sql
+++ b/migration/20.03/2003.sql
@@ -152,10 +152,11 @@ CREATE TABLE entities_folders
 (
   id serial NOT NULL,
   folder_id INTEGER NOT NULL,
-  entity_id INTEGER NOT NULL,
+  entity_id INTEGER,
   edition boolean NOT NULL,
+  keywords jsonb NOT NULL DEFAULT '[]',
   CONSTRAINT entities_folders_pkey PRIMARY KEY (id),
-  CONSTRAINT entities_folders_unique_key UNIQUE (folder_id, entity_id)
+  CONSTRAINT entities_folders_unique_key UNIQUE (folder_id, entity_id, keywords)
 )
 WITH (OIDS=FALSE);
 
diff --git a/sql/structure.sql b/sql/structure.sql
index f89f8125fa91b69f7a6ca3184d5edf37a70c077f..9e79d68ccf3a768872b6510be3fff7d86ed49f0a 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -517,10 +517,11 @@ CREATE TABLE entities_folders
 (
   id serial NOT NULL,
   folder_id INTEGER NOT NULL,
-  entity_id INTEGER NOT NULL,
+  entity_id INTEGER,
   edition boolean NOT NULL,
+  keywords jsonb NOT NULL DEFAULT '[]',
   CONSTRAINT entities_folders_pkey PRIMARY KEY (id),
-  CONSTRAINT entities_folders_unique_key UNIQUE (folder_id, entity_id)
+  CONSTRAINT entities_folders_unique_key UNIQUE (folder_id, entity_id, keywords)
 )
 WITH (OIDS=FALSE);