diff --git a/00_DD/DD_ECM.sql b/00_DD/DD_ECM.sql
index e1fac4f..a79e272 100644
--- a/00_DD/DD_ECM.sql
+++ b/00_DD/DD_ECM.sql
@@ -1,14 +1,19 @@
-/*##################################
-1.	Search for @MY_INSTALL_USER and replace it with the username You use for administration
-2.	In case windream is installed on another SQL-Server: 
-	Replace windream60 in code with name of linked Database - Example: [172.24.12.41\REMOTESERVER\windream60].
-3.  Search for DIGITALDATA.LOCAL and replace with Your Domainname
-4.  Add the ECM-Login Data
-	Search for @ECM_IP and replace it with IP of MSSQL Server
-	Search for @ECM_USER and replace it with DB-Username for ECM-DB
-	Search for @ECM_PW and replace it with PW for ECM-User
-	####################################*/
-
+--##################################
+--1.	Replace @ADMINUSER NAmes
+DECLARE @ADMINUSER1 VARCHAR(100),@ADMINUSER2 VARCHAR(100)
+SET @ADMINUSER1 = 'Administrator'
+SET @ADMINUSER2 = 'digitaldata'
+-- 2. In case windream is installed on another SQL-Server: 
+-- Replace windream60 in code with name of linked Database - Example: [172.24.12.41\REMOTESERVER\windream60].
+-- 3. Search for DIGITALDATA.LOCAL and replace with Your Domainname
+-- 4. Add the ECM-Login Data
+-- Search for @ECM_IP and replace it with IP or Name of MSSQL Server
+-- Search for @ECM_USER and replace it with DB-Username for ECM-DB
+-- Search for @ECM_PW and replace it with PW for ECM-User
+--	####################################
+CREATE TABLE TBIMPORT_USER (USR_NAME VARCHAR(100));
+INSERT INTO TBIMPORT_USER (USR_NAME) VALUES (@ADMINUSER1);
+INSERT INTO TBIMPORT_USER (USR_NAME) VALUES (@ADMINUSER2);
 CREATE TABLE TBDD_BASECONFIG
 (
 	GUID           				TINYINT,
@@ -207,10 +212,10 @@ CREATE TABLE TBDD_USER
 	CONSTRAINT				PK_TBDD_USER	PRIMARY KEY (GUID)
 )
 GO
-DECLARE @MY_INSTALL_ADMIN_USER VARCHAR(50)
-SET @MY_INSTALL_ADMIN_USER = '@MY_INSTALL_USER'
-INSERT INTO TBDD_USER(PRENAME,NAME,USERNAME) VALUES 
-('DefPrename','DefSurname',@MY_INSTALL_ADMIN_USER)
+
+
+INSERT INTO TBDD_USER(PRENAME,NAME,USERNAME)
+SELECT 'Prename','Surname',USR_NAME FROM TBIMPORT_USER;
 GO
 
 
@@ -761,6 +766,8 @@ GO
 ------------------------------------------------------------------------------
 INSERT INTO TBDD_CONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('DD_ECM','MS-SQL','@ECM_IP','DD_ECM','@ECM_USER','@ECM_PW')
 GO
+INSERT INTO TBDD_CONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('IDB','MS-SQL','@ECM_IP','DD_ECM','@ECM_USER','@ECM_PW')
+GO
 --INSERT INTO TBCONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('Zeiterfassung','SQLOLEDB','192.168.48.13','DD_ZEITERFASSUNG_AB_112011','sa','dd')
 --GO
 --INSERT INTO TBCONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('Oracle-Fuchs','OraOLEDB.Oracle','192.168.48.32','10FUCHS','IID_GH','dd')
@@ -1005,6 +1012,7 @@ CREATE TABLE TBDD_INDEX_AUTOM
 	SQL_ACTIVE			BIT				DEFAULT 0				NOT NULL,
 	COMMENT				VARCHAR(400),
 	ACTIVE				BIT				DEFAULT 1				NOT NULL,	-- 1 - Index aktiv, bei 0 - inaktiv.
+	SEQUENCE			INT				DEFAULT 1				NOT NULL,
 	ADDED_WHO			VARCHAR(50)		DEFAULT 'DEFAULT'		NOT NULL,
 	ADDED_WHEN			DATETIME		DEFAULT GETDATE()		,
 	CHANGED_WHO			VARCHAR(50),
@@ -1581,7 +1589,6 @@ DECLARE c_REDO CURSOR FOR
     WHILE @@FETCH_STATUS = 0
 	BEGIN
 		DECLARE @ECM_USR_ID INTEGER
-		--SELECT [dwUserID]	FROM windream60.[dbo].[UserInfo] where UPPER(szUserName) = UPPER('windream')
 
 		SELECT @ECM_USR_ID = [dwUserID]	FROM windream60.[dbo].[UserInfo] where UPPER(szUserName) = UPPER(@USERNAME)
 		IF @ECM_USR_ID IS NOT NULL
diff --git a/00_IDB/CreateDBObjects.sql b/00_IDB/CreateDBObjects.sql
index 719fd31..d120d96 100644
--- a/00_IDB/CreateDBObjects.sql
+++ b/00_IDB/CreateDBObjects.sql
@@ -1,4 +1,6 @@
 --REPLACE @MY_DD_ECM_DB WITH REAL_DBNAME
+USE IDB
+GO
 ALTER TABLE DD_ECM.dbo.TBDD_DOKUMENTART
 ADD IDB_DOCTYPE_ID INT NOT NULL DEFAULT 0;
 GO
@@ -108,30 +110,6 @@ AS
   FROM INSERTED
   WHERE TBIDB_ACTION_STEPS.GUID = INSERTED.GUID
 GO
-CREATE TABLE TBIDB_FULLTEXT_OBJECT
-(
-	GUID			BIGINT			NOT NULL	IDENTITY (1, 1),
-	OBJECT_ID		BIGINT			NOT NULL,
-	FULL_TEXT		NVARCHAR(MAX)	NOT NULL,
-	CAT_ID			INTEGER			NOT NULL,	
-	ADDED_WHO		BIGINT,
-	ADDED_WHEN		DATETIME		NOT NULL DEFAULT GETDATE(),
-	CHANGED_WHO	    BIGINT,
-	CHANGED_WHEN   	DATETIME,
-	CONSTRAINT PK_TBIDB_FULLTEXT_OBJECT	PRIMARY KEY (GUID),
-	CONSTRAINT UN_TBIDB_FULLTEXT_OBJECT   UNIQUE(OBJECT_ID,CAT_ID),
-	CONSTRAINT FK_TBIDB_FULLTEXT_OBJECT_CAT_ID FOREIGN KEY (CAT_ID)  REFERENCES  TBIDB_CATALOG (GUID),
-	CONSTRAINT FK_TBIDB_FULLTEXT_OBJECT_ADDED_WHO_T_ID FOREIGN KEY (ADDED_WHO)  REFERENCES  TBIDB_TERM_VALUE_VARCHAR (GUID),
-	CONSTRAINT FK_TBIDB_FULLTEXT_OBJECT_CHANGED_WHO_T_ID FOREIGN KEY (CHANGED_WHO)  REFERENCES  TBIDB_TERM_VALUE_VARCHAR (GUID),)
-GO
-CREATE TRIGGER TBIDB_FULLTEXT_OBJECT_AFT_UPD ON TBIDB_FULLTEXT_OBJECT
-FOR UPDATE
-AS
-  UPDATE TBIDB_FULLTEXT_OBJECT SET CHANGED_WHEN = GETDATE()
-  FROM INSERTED
-  WHERE TBIDB_FULLTEXT_OBJECT.GUID = INSERTED.GUID
-GO
-
 
 INSERT INTO TBIDB_CATALOG (CAT_TITLE,CAT_STRING) VALUES ('DB_VERSION','1.0.4.1')
 GO
@@ -164,7 +142,30 @@ AS
   FROM INSERTED
   WHERE TBIDB_CATALOG.GUID = INSERTED.GUID
 GO
-
+--DROP TABLE TBIDB_BUSINESS_ENTITY
+CREATE TABLE TBIDB_BUSINESS_ENTITY
+(
+	GUID				INTEGER			NOT NULL	IDENTITY (1, 1),
+	TITLE				VARCHAR(500)	NOT NULL,
+	PARENT_ENT_ID		INTEGER			NOT NULL	DEFAULT 0,
+	INHERITS_ATTRIBUTES	BIT				NOT NULL	DEFAULT 1,
+	COMMENT				VARCHAR(1000),
+	ADDED_WHO			VARCHAR(30)     NOT NULL    DEFAULT 'SYSTEM',
+	ADDED_WHEN   		DATETIME 	    NOT NULL 	DEFAULT (GETDATE()),
+	CHANGED_WHO			VARCHAR(30),
+	CHANGED_WHEN		DATETIME,
+	CONSTRAINT PK_TBIDB_BUSINESS_ENTITY 	   PRIMARY KEY (GUID),
+	CONSTRAINT UQ_TBIDB_BUSINESS_ENTITY		UNIQUE (TITLE)
+)
+GO
+CREATE TRIGGER TBIDB_BUSINESS_ENTITY_AFT_UPD ON TBIDB_BUSINESS_ENTITY
+FOR UPDATE
+AS
+  UPDATE TBIDB_BUSINESS_ENTITY SET CHANGED_WHEN = GETDATE()
+  FROM INSERTED
+  WHERE TBIDB_BUSINESS_ENTITY.GUID = INSERTED.GUID
+GO
+INSERT INTO TBIDB_BUSINESS_ENTITY (TITLE) VALUES ('DEFAULT');
 --DROP TABLE TBIDB_OBJECT_STORE
 CREATE TABLE TBIDB_OBJECT_STORE
 (
@@ -276,7 +277,7 @@ CREATE TABLE TBIDB_TERM_VALUE_VARCHAR
 	CHANGED_WHEN	DATETIME,
 	CONSTRAINT PK_TBIDB_TERM_VALUE_VARCHAR  	   PRIMARY KEY (GUID),
 	CONSTRAINT 		UQ_TBIDB_TERM_VALUE_VARCHAR	   UNIQUE (TERM_VALUE),
-	CONSTRAINT 		UQ_TBIDB_TERM_VALUE_VARCHAR	   UNIQUE (TERM_VALUE_REVERSE)
+	CONSTRAINT 		UQ_TBIDB_TERM_VALUE_VARCHAR_REV	   UNIQUE (TERM_VALUE_REVERSE)
 )
 GO
 CREATE TRIGGER TBIDB_TERM_VALUE_VARCHAR_AFT_UPD ON TBIDB_TERM_VALUE_VARCHAR
@@ -398,6 +399,30 @@ AS
   FROM INSERTED
   WHERE TBIDB_TERM_VALUE_DATETIME.GUID = INSERTED.GUID
 GO
+CREATE TABLE TBIDB_FULLTEXT_OBJECT
+(
+	GUID			BIGINT			NOT NULL	IDENTITY (1, 1),
+	OBJECT_ID		BIGINT			NOT NULL,
+	FULL_TEXT		NVARCHAR(MAX)	NOT NULL,
+	CAT_ID			INTEGER			NOT NULL,	
+	ADDED_WHO		BIGINT,
+	ADDED_WHEN		DATETIME		NOT NULL DEFAULT GETDATE(),
+	CHANGED_WHO	    BIGINT,
+	CHANGED_WHEN   	DATETIME,
+	CONSTRAINT PK_TBIDB_FULLTEXT_OBJECT	PRIMARY KEY (GUID),
+	CONSTRAINT UN_TBIDB_FULLTEXT_OBJECT   UNIQUE(OBJECT_ID,CAT_ID),
+	CONSTRAINT FK_TBIDB_FULLTEXT_OBJECT_CAT_ID FOREIGN KEY (CAT_ID)  REFERENCES  TBIDB_CATALOG (GUID),
+	CONSTRAINT FK_TBIDB_FULLTEXT_OBJECT_ADDED_WHO_T_ID FOREIGN KEY (ADDED_WHO)  REFERENCES  TBIDB_TERM_VALUE_VARCHAR (GUID),
+	CONSTRAINT FK_TBIDB_FULLTEXT_OBJECT_CHANGED_WHO_T_ID FOREIGN KEY (CHANGED_WHO)  REFERENCES  TBIDB_TERM_VALUE_VARCHAR (GUID),)
+GO
+CREATE TRIGGER TBIDB_FULLTEXT_OBJECT_AFT_UPD ON TBIDB_FULLTEXT_OBJECT
+FOR UPDATE
+AS
+  UPDATE TBIDB_FULLTEXT_OBJECT SET CHANGED_WHEN = GETDATE()
+  FROM INSERTED
+  WHERE TBIDB_FULLTEXT_OBJECT.GUID = INSERTED.GUID
+GO
+
 --DROP TABLE TBIDB_ATTRIBUTE_TYPE
 CREATE TABLE TBIDB_ATTRIBUTE_TYPE
 (
@@ -460,30 +485,7 @@ AS
   FROM INSERTED
   WHERE TBIDB_OBJECT_KIND.GUID = INSERTED.GUID
 GO
---DROP TABLE TBIDB_BUSINESS_ENTITY
-CREATE TABLE TBIDB_BUSINESS_ENTITY
-(
-	GUID				INTEGER			NOT NULL	IDENTITY (1, 1),
-	TITLE				VARCHAR(500)	NOT NULL,
-	PARENT_ENT_ID		INTEGER			NOT NULL	DEFAULT 0,
-	INHERITS_ATTRIBUTES	BIT				NOT NULL	DEFAULT 1,
-	COMMENT				VARCHAR(1000),
-	ADDED_WHO			VARCHAR(30)     NOT NULL    DEFAULT 'SYSTEM',
-	ADDED_WHEN   		DATETIME 	    NOT NULL 	DEFAULT (GETDATE()),
-	CHANGED_WHO			VARCHAR(30),
-	CHANGED_WHEN		DATETIME,
-	CONSTRAINT PK_TBIDB_BUSINESS_ENTITY 	   PRIMARY KEY (GUID),
-	CONSTRAINT UQ_TBIDB_BUSINESS_ENTITY		UNIQUE (TITLE)
-)
-GO
-CREATE TRIGGER TBIDB_BUSINESS_ENTITY_AFT_UPD ON TBIDB_BUSINESS_ENTITY
-FOR UPDATE
-AS
-  UPDATE TBIDB_BUSINESS_ENTITY SET CHANGED_WHEN = GETDATE()
-  FROM INSERTED
-  WHERE TBIDB_BUSINESS_ENTITY.GUID = INSERTED.GUID
-GO
-INSERT INTO TBIDB_BUSINESS_ENTITY (TITLE) VALUES ('DEFAULT');
+
 
 CREATE TABLE TBIDB_LANGUAGE
 (
@@ -558,13 +560,14 @@ BEGIN CATCH
 	+ CONVERT(VARCHAR(500),ERROR_MESSAGE())
 END CATCH
 GO
-CREATE TRIGGER TBIDB_OBJECT_AFT_UPD ON TBIDB_OBJECT
+
+CREATE TRIGGER [dbo].[TBIDB_OBJECT_AFT_UPD] ON [dbo].[TBIDB_OBJECT]
 FOR UPDATE
 AS
-  UPDATE TBIDB_OBJECT SET CHANGED_WHEN = GETDATE()
-  FROM INSERTED
-  WHERE TBIDB_OBJECT.IDB_OBJ_ID = INSERTED.IDB_OBJ_ID
-GO
+IF UPDATE(REFERENCE_KEY) OR UPDATE(PARENT_OBJ_ID) OR UPDATE(IS_VERSION) OR UPDATE(ACTIVE) OR UPDATE(DELETED) OR UPDATE(COMMENT)
+	  UPDATE TBIDB_OBJECT SET CHANGED_WHEN = GETDATE()
+	  FROM INSERTED
+	  WHERE TBIDB_OBJECT.IDB_OBJ_ID = INSERTED.IDB_OBJ_ID
 
 CREATE TABLE TBIDB_STRUCTURE_TYPE
 (
@@ -613,11 +616,6 @@ AS
   FROM INSERTED
   WHERE TBIDB_OBJECT_STRUCTURE_TYPE.GUID = INSERTED.GUID
 GO
-
-INSERT INTO TBIDB_OBJECT_STRUCTURE_TYPE (IDB_OBJ_ID,STRUCTURE_ID,RELATION_ID) VALUES (12031,1 ,(SELECT GUID FROM TBIDB_DOCTYPE WHERE TITLE = 'Projektunterlage'))
-INSERT INTO TBIDB_OBJECT_STRUCTURE_TYPE (IDB_OBJ_ID,STRUCTURE_ID,RELATION_ID) VALUES (12037,1 ,(SELECT GUID FROM TBIDB_DOCTYPE WHERE TITLE = 'Lieferschein'))
-INSERT INTO TBIDB_OBJECT_STRUCTURE_TYPE (IDB_OBJ_ID,STRUCTURE_ID,RELATION_ID) VALUES (12035,1 ,(SELECT GUID FROM TBIDB_DOCTYPE WHERE TITLE = 'Gutschrift'))
-
 CREATE TABLE TBIDB_DOC_INFO
 (
 	GUID				BIGINT			NOT NULL	IDENTITY (1, 1),
@@ -955,7 +953,7 @@ CREATE NONCLUSTERED INDEX IDXTBIDB_OBJECT_METADATA_IDBOBJID
 ON [dbo].[TBIDB_OBJECT_METADATA] ([IDB_OBJ_ID])
 GO
 
-DROP TABLE TBIDB_OBJECT_METADATA_CHANGE;
+--DROP TABLE TBIDB_OBJECT_METADATA_CHANGE;
 CREATE TABLE TBIDB_OBJECT_METADATA_CHANGE
 (
 	GUID			BIGINT			NOT NULL	IDENTITY (1, 1),
@@ -990,7 +988,7 @@ CREATE TABLE TBIDB_OBJECT_METADATA_CHANGE
 	CONSTRAINT FK_OMDC_NEW_DATE_TERM_ID FOREIGN KEY (NEW_DATE_TERM_ID)  REFERENCES  TBIDB_TERM_VALUE_DATE (GUID),
 )
 GO
-DROP TABLE TBIDB_OBJECT_METADATA_ADD
+--DROP TABLE TBIDB_OBJECT_METADATA_ADD
 CREATE TABLE [dbo].[TBIDB_OBJECT_METADATA_ADD](
 	[GUID]			BIGINT IDENTITY(1,1) NOT NULL,
 	[IDB_OBJ_ID]	BIGINT NOT NULL,
@@ -1307,7 +1305,7 @@ GO
 
 
 GO
-DROP TABLE TBIDB_MYOBJECT_STATES;
+--DROP TABLE TBIDB_MYOBJECT_STATES;
 CREATE TABLE TBIDB_MYOBJECT_STATES
 (
 	GUID			BIGINT			NOT NULL	IDENTITY (1, 1),
@@ -1367,19 +1365,24 @@ INSERT INTO [dbo].[TBIDB_COMMON_SQL]
            ('FLOW_SEARCH_SQL_BASE'
            ,'SELECT 
 			DOC.*
+			,CONVERT(BIT,IIF(CHK.CHECKED_OUT_WHEN IS NULL,''False'',''True'')) CHECKED_OUT
 			FROM 
 				TBIDB_SEARCH_RESULT_TERM_USER RES INNER JOIN VWIDB_LANGUAGE_TERM VWLTERM ON RES.MD_GUID = VWLTERM.MD_ID
 				INNER JOIN VWIDB_DOCRESULT_DE DOC ON VWLTERM.IDB_OBJ_ID = DOC.DocID
+				LEFT JOIN TBIDB_OBJECT_CHECK_IN_OUT CHK ON DOC.DocID = CHK.IDB_OBJ_ID
 			WHERE
-				RES.USR_ID = @USER_ID AND VWLTERM.LANG_CODE = ''@LANG_CODE''' + CHAR(10)
-				+ 'UNION
+				RES.USR_ID = @USER_ID AND VWLTERM.LANG_CODE = ''@LANG_CODE''
+UNION
 			SELECT 
 				DOC.*
+				,CONVERT(BIT,IIF(CHK.CHECKED_OUT_WHEN IS NULL,''False'',''True'')) CHECKED_OUT
 			FROM 
 				TBIDB_SEARCH_RESULT_STRUCT_TYPE_USER RES INNER JOIN VWIDB_DOC_DOCTYPE VWDT ON RES.STRUCTURE_ID = VWDT.STRUCTURE_ID AND RES.IDB_OBJ_ID = VWDT.IDB_OBJ_ID
 				INNER JOIN VWIDB_DOCRESULT_DE DOC ON RES.IDB_OBJ_ID = DOC.DocID
+				LEFT JOIN TBIDB_OBJECT_CHECK_IN_OUT CHK ON DOC.DocID = CHK.IDB_OBJ_ID
 			WHERE
-				RES.USR_ID = @USER_ID AND VWDT.LANG_CODE = ''@LANG_CODE''','SYSTEM')
+				RES.USR_ID = @USER_ID AND VWDT.LANG_CODE = ''@LANG_CODE''
+				AND CHK.CHECKED_IN_WHEN IS NULL','SYSTEM')
 GO
 
 
@@ -1420,9 +1423,25 @@ BEGIN
 
 END
 GO
+CREATE PROCEDURE PRIDB_SEARCH_AUTOSUGGEST @pLANGCODE VARCHAR(5),@pUSRID INT
+AS
+DECLARE @TBRESULT TABLE(TERM VARCHAR(900))
+INSERT INTO @TBRESULT (TERM)
+select DISTINCT TERM.TERM_VALUE
+	FROM TBIDB_TERM_VALUE_VARCHAR TERM
+	INNER JOIN TBIDB_LANGUAGE_TERM TLANG ON TLANG.TERM_ID = TERM.GUID
+	INNER JOIN TBIDB_LANGUAGE LANG ON LANG.GUID = TLANG.LANG_ID
+	INNER JOIN TBIDB_OBJECT_METADATA MD ON TLANG.OBJECT_ID = MD.GUID
+	INNER JOIN TBIDB_OBJECT OBJ ON MD.IDB_OBJ_ID = OBJ.IDB_OBJ_ID
+	WHERE 
+	OBJ.ACTIVE = 1 AND LANG.LANG_CODE = @pLANGCODE;
+INSERT INTO @TBRESULT (TERM)
+select Doctype FROM VWIDB_DOC_DOCTYPE where LANG_CODE = @pLANGCODE;
+SELECT * FROM @TBRESULT;
+GO
 --DROP TABLE TBIDB_SEARCH_PROFILE
-DROP TABLE TBIDB_SEARCH_LANGUAGE_SQL_RESULT
-DROP TABLE TBIDB_SEARCH_PROFILE_USER_GROUP
+--DROP TABLE TBIDB_SEARCH_LANGUAGE_SQL_RESULT
+--DROP TABLE TBIDB_SEARCH_PROFILE_USER_GROUP
 CREATE TABLE TBIDB_SEARCH_PROFILE
 (
 	GUID			INTEGER			NOT NULL	IDENTITY (1, 1),
@@ -1986,7 +2005,7 @@ AS
   FROM INSERTED
   WHERE TBIDB_OBJECT_DYNAMIC_FOLDER.GUID = INSERTED.GUID
 GO
-DROP TABLE TBIDB_OBJECT_CHECK_IN_OUT
+--DROP TABLE TBIDB_OBJECT_CHECK_IN_OUT
 CREATE TABLE TBIDB_OBJECT_CHECK_IN_OUT
 (
 	GUID			BIGINT			NOT NULL	IDENTITY (1, 1),
@@ -3138,7 +3157,7 @@ SELECT
 	T.IDB_OBJ_ID
 	,T.ATTR_ID
 	,T1.TITLE ATTR_NAME
-	,(SELECT [dbo].[FNIDB_GET_TERM_TEXT] (T.IDB_OBJ_ID,T.ATTR_ID))		 AS 'Term_Value'
+	,(SELECT [dbo].[FNIDB_GET_TERM_TEXT] (T.IDB_OBJ_ID,T.ATTR_ID,'de-DE'))		 AS 'Term_Value'
 FROM
 	TBIDB_OBJECT_METADATA T INNER JOIN TBIDB_ATTRIBUTE T1 ON T.ATTR_ID = T1.GUID
 	INNER JOIN TBIDB_ATTRIBUTE_TYPE T2 ON T1.TYP_ID = T2.GUID
@@ -3158,8 +3177,8 @@ select
 	T.DELETED_WHEN [Gelöscht wann]
 from TBIDB_OBJECT_METADATA_DELETE T 
 	INNER JOIN TBIDB_ATTRIBUTE T1 ON T.ATTR_ID = T1.GUID 
-	INNER JOIN TBIDB_LANGUAGE_TERM T2 ON T.T = T2.GUID 
-	INNER JOIN TBIDB_TERM_VALUE_VARCHAR T3 ON T2.TEXT_TERM_ID = T3.GUID
+	INNER JOIN TBIDB_LANGUAGE_TERM T2 ON T.GUID = T2.[OBJECT_ID] 
+	INNER JOIN TBIDB_TERM_VALUE_VARCHAR T3 ON T2.TERM_ID = T3.GUID
 GO
 CREATE OR ALTER VIEW [dbo].[VWIDB_VALUE_TEXT] AS
 select TOP 100 PERCENT
@@ -3199,8 +3218,8 @@ CREATE VIEW VWIDB_CONVERSATION AS
 SELECT
 	GUID As CONVERSATION_ID
 	,IDB_OBJ_ID
-	,[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (TITLE_TERM_ID) as TITLE
-	,[dbo].[FNIDB_GET_STATE_FOR_OBJECT_ID] (GUID) AS CONVERSATION_STATE
+	,[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (TITLE_TERM_ID,'de-DE') as TITLE
+	--,[dbo].[FNIDB_GET_STATE_FOR_OBJECT_ID] (GUID) AS CONVERSATION_STATE
 	,[dbo].[FNIDB_GET_TERM_VALUE_VARCHAR] (ADDED_WHO) as ADDED_WHO
 	,ADDED_WHEN
 	,[dbo].[FNIDB_GET_TERM_VALUE_VARCHAR] (CHANGED_WHO) as CHANGED_WHO
@@ -3211,11 +3230,11 @@ CREATE VIEW VWIDB_CONV_MESSAGES AS
 select 
 	T.GUID,
 	T.CONV_ID,
-    (SELECT EMAIL FROM @MY_DD_ECM_DB.dbo.TBDD_USER WHERE GUID = T.TO_USER) TO_USER,
-	[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T1.TITLE_TERM_ID) AS CONV_TITLE
+    (SELECT EMAIL FROM DD_ECM.dbo.TBDD_USER WHERE GUID = T.TO_USER) TO_USER,
+	[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T1.TITLE_TERM_ID,'de-DE') AS CONV_TITLE
 	,[dbo].[FNIDB_GET_TERM_VALUE_VARCHAR] (T.FROM_USER) as USER_FROM
-	,[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T.MESSAGE_TERM_ID) as MESSAGE_TEXT
-	,[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T.ADDED_WHO) as ADDED_WHO
+	,[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T.MESSAGE_TERM_ID,'de-DE') as MESSAGE_TEXT
+	,[dbo].[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T.ADDED_WHO,'de-DE') as ADDED_WHO
 	,T.ADDED_WHEN
 from TBIDB_CONVERSATION_MESSAGE T INNER JOIN TBIDB_CONVERSATION_OBJECT T1 ON T.CONV_ID = T1.GUID
 GO
@@ -3488,6 +3507,42 @@ from TBIDB_OBJECT_METADATA T
 	INNER JOIN TBIDB_LANGUAGE T4 ON T2.LANG_ID = T4.GUID
 WHERE OBJ.ACTIVE = 1 AND OBJ.KIND_TYPE_ID = 3 AND T1.GUID = (SELECT GUID FROM TBIDB_ATTRIBUTE WHERE TITLE = 'VIRTUAL_FOLDER_PART')
 GO
+CREATE VIEW VWOBJECT_CHECKED_OUT AS
+SELECT 
+	CHK.GUID ID,
+	CHK.IDB_OBJ_ID,
+	CHK.CHECKED_OUT_WHEN,
+	CHK.CHECKED_IN_WHEN,
+	USR.EMAIL,
+	USR.NAME + ', ' + USR.PRENAME USR_NAME_PRENAME
+
+FROM TBIDB_OBJECT_CHECK_IN_OUT CHK INNER JOIN DD_ECM.dbo.TBDD_USER USR ON CHK.ADDED_WHO = USR.USERNAME
+GO
+CREATE VIEW [dbo].[VWIDB_OBJECT]
+AS
+SELECT
+	OBJ.IDB_OBJ_ID, 
+	dbo.TBIDB_OBJECT_BE.BE_ID, 
+	dbo.TBIDB_OBJECT_KIND.GUID AS KIND_ID, 
+	dbo.TBIDB_OBJECT_KIND.KIND_NAME, 
+	dbo.TBIDB_BUSINESS_ENTITY.TITLE AS BE_NAME,
+	dbo.TBIDB_OBJECT_STORE.GUID AS STORE_ID,
+	dbo.TBIDB_OBJECT_STORE.OBJECT_TITLE AS STORE_NAME,
+	DT.Doctype_ID,
+	DT.SYS_TITLE as DoxtypeSysTitle
+FROM        
+	dbo.TBIDB_OBJECT OBJ INNER JOIN
+	dbo.TBIDB_OBJECT_BE ON OBJ.IDB_OBJ_ID = dbo.TBIDB_OBJECT_BE.IDB_OBJ_ID INNER JOIN
+	dbo.TBIDB_OBJECT_KIND ON OBJ.KIND_TYPE_ID = dbo.TBIDB_OBJECT_KIND.GUID INNER JOIN
+	dbo.TBIDB_FILE_OBJECT ON dbo.TBIDB_FILE_OBJECT.IDB_OBJ_ID = OBJ.IDB_OBJ_ID INNER JOIN
+	dbo.TBIDB_OBJECT_STORE ON dbo.TBIDB_OBJECT_STORE.GUID = dbo.TBIDB_FILE_OBJECT.OBJ_ST_ID INNER JOIN
+	dbo.TBIDB_BUSINESS_ENTITY ON dbo.TBIDB_OBJECT_BE.BE_ID = dbo.TBIDB_BUSINESS_ENTITY.GUID INNER JOIN
+	VWIDB_DOC_DOCTYPE DT ON OBJ.IDB_OBJ_ID = DT.IDB_OBJ_ID
+GO
+
+
+
+
 /*###########################################
 ############## PROCEDURES ###################
 #############################################*/
@@ -3711,6 +3766,8 @@ EXEC PRIDB_NEW_IDB_STATE 'File deleted', 'SYSTEM';
 EXEC PRIDB_NEW_IDB_STATE 'Metadata changed','SYSTEM';
 EXEC PRIDB_NEW_IDB_STATE 'Attributevalue deleted','SYSTEM';
 EXEC PRIDB_NEW_IDB_STATE 'File opened', 'SYSTEM';
+EXEC PRIDB_NEW_IDB_STATE 'File Checked Out', 'SYSTEM';
+EXEC PRIDB_NEW_IDB_STATE 'File Checked In', 'SYSTEM';
 
 EXEC PRIDB_SET_IDB_STATE_LANG 'File Versioned','Datei versioniert', 'de-DE', 'SYSTEM';
 EXEC PRIDB_SET_IDB_STATE_LANG 'File added','Datei erstellt', 'de-DE', 'SYSTEM';
@@ -3719,6 +3776,8 @@ EXEC PRIDB_SET_IDB_STATE_LANG 'File deleted','Datei gel
 EXEC PRIDB_SET_IDB_STATE_LANG 'Metadata changed','Attributwert geändert', 'de-DE', 'SYSTEM';
 EXEC PRIDB_SET_IDB_STATE_LANG 'Attributevalue deleted','Attributwert gelöscht', 'de-DE', 'SYSTEM';
 EXEC PRIDB_SET_IDB_STATE_LANG 'File opened','Datei geöffnet', 'de-DE', 'SYSTEM';
+EXEC PRIDB_SET_IDB_STATE_LANG 'File Checked Out','Datei ausgechecked', 'de-DE', 'SYSTEM';
+EXEC PRIDB_SET_IDB_STATE_LANG 'File Checked In','Datei wieder eingecheckt', 'de-DE', 'SYSTEM';
 GO
 
 CREATE OR ALTER PROCEDURE [dbo].[PRIDB_DELETE_ATTRIBUTE_DATA] @IDB_OBJ_ID BIGINT, @ATTRIBUTE VARCHAR(100), @WHO VARCHAR(100)
@@ -4135,7 +4194,7 @@ BEGIN
 END
 
 GO
-ALTER   PROCEDURE [dbo].[PRIDB_CREATE_VIEW_DOC_DATA] @pLANGCODE VARCHAR(5) ,@pVar VARCHAR(15) = 'DEFAULT'
+CREATE OR ALTER PROCEDURE [dbo].[PRIDB_CREATE_VIEW_DOC_DATA] @pLANGCODE VARCHAR(5) ,@pVar VARCHAR(15) = 'DEFAULT'
 AS
 DECLARE
 	@ATTR_ID	INT,
@@ -4522,7 +4581,7 @@ BEGIN
 		INSERT INTO TBIDB_CONVERSATION_OBJECT (TITLE_TERM_ID,IDB_OBJ_ID,ADDED_WHO) VALUES (@LANG_TITLE_TERM_ID,@pIDB_OBJ_ID,@ADDED_WHO_TERM_ID)
 	
 	DECLARE @STARTED_STATE BIGINT
-	SELECT @STARTED_STATE = GUID FROM TBIDB_STATES T WHERE dbo.[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (STATE_LTERM_ID) = 'Started'
+	SELECT @STARTED_STATE = GUID FROM TBIDB_STATES T WHERE dbo.[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T.TITLE,'de-DE') = 'Started'
 		
 	DECLARE @CONVERSATION_ID BIGINT
 	SELECT @CONVERSATION_ID = GUID FROM TBIDB_CONVERSATION_OBJECT WHERE TITLE_TERM_ID = @LANG_TITLE_TERM_ID AND IDB_OBJ_ID = @pIDB_OBJ_ID
@@ -4557,7 +4616,7 @@ BEGIN
 	,@ENDED_STATE	BIGINT
 
 	SELECT @LANG_ID = GUID FROM TBIDB_LANGUAGE WHERE LANG_CODE = @pLANG_CODE
-	SELECT @ENDED_STATE = GUID FROM TBIDB_STATES T WHERE dbo.[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (STATE_LTERM_ID) = 'Ended'
+	SELECT @ENDED_STATE = GUID FROM TBIDB_STATES T WHERE dbo.[FNIDB_GET_TERM_FOR_LANG_TERM_ID] (T.TITLE,'de-DE') = 'Ended'
 
 	DECLARE @WHO_TERM_ID BIGINT
 	EXEC PRIDB_NEW_TERM 'VARCHAR',@pWHO,@pWHO,@TERM_ID = @WHO_TERM_ID OUTPUT;
@@ -4687,6 +4746,7 @@ BEGIN
 END
 GO
 
+
 CREATE PROCEDURE [dbo].[PRIDB_NEW_SEARCH_PROFILE] @BE_ID INT, @pTITLE VARCHAR(512),@pWHO VARCHAR(100),@pCOMMENT VARCHAR(900) = NULL, @pLANG_CODE VARCHAR(5) = 'de-DE'
 AS
 BEGIN
@@ -4729,7 +4789,7 @@ BEGIN
     WHILE @@FETCH_STATUS = 0
 	BEGIN
 		IF NOT EXISTS (SELECT GUID FROM TBIDB_SEARCH_RESULT_ATTRIBUTES WHERE SEARCH_PROFIL_ID = @SEARCH_ID AND ATTRIBUTE_ID = @ATTR_ID)
-			EXEC PRIDB_NEW_SEARCH_RESULT_ATTRIBUTE @SEARCH_ID,@ATTR_ID,@pWHO_TERMID,@SEQUENCE
+			EXEC PRIDB_NEW_SEARCH_RESULT_ATTRIBUTE @SEARCH_ID,@ATTR_ID,@WHO_TERM_ID,@SEQUENCE
 		SET @SEQUENCE += 1
 		FETCH NEXT FROM cursorDefaultAttributes INTO @ATTR_ID
 	END
@@ -4737,7 +4797,6 @@ BEGIN
 	DEALLOCATE cursorDefaultAttributes
 END
 GO
-GO
 --CREATE PROCEDURE [dbo].[PRIDB_NEW_SEARCH_SQL_RESULT] @SEARCH_ID INT,@pWHO_TERMID BIGINT
 --AS
 --BEGIN
@@ -5041,7 +5100,7 @@ GO
 --		   ,@WHO_TERM_ID FROM TBIDB_USER_SEARCH_CRITERIA WHERE USERID = @pUserID AND SEARCH_PROFIL_ID = @pSEARCHID
 --END
 --GO
-ALTER   PROCEDURE [dbo].[PRIDB_NEW_OBJECT] @KIND_TYPE VARCHAR(20),@WHO VARCHAR(100),@FOREIGN_REFID Bigint = 0,@PARENT_OBJ_ID BIGINT = 0, @IDB_OBJ_ID BIGINT OUTPUT
+CREATE OR ALTER PROCEDURE [dbo].[PRIDB_NEW_OBJECT] @KIND_TYPE VARCHAR(20),@WHO VARCHAR(100),@FOREIGN_REFID Bigint = 0,@PARENT_OBJ_ID BIGINT = 0, @IDB_OBJ_ID BIGINT OUTPUT
 AS
 BEGIN
 	DECLARE 
@@ -5806,6 +5865,98 @@ OPEN c_CATALOG_USR
 		FETCH NEXT FROM c_CATALOG_USR INTO @USR_GUID
 	END
 CLOSE c_CATALOG_USR
-DEALLOCATE c_CATALOG_USR
+DEALLOCATE c_CATALOG_USR;
+GO
+
+USE DD_ECM
+GO
+CREATE VIEW VWGI_DOCTYPE_USER AS 
+SELECT DISTINCT
+	T.GUID AS [USER_ID],
+	T.USERNAME,
+	--T2.NAME AS GROUP_NAME,
+	T3.DOCTYPE_ID,
+	T4.BEZEICHNUNG AS DOCTYPE,
+	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
+	T4.KURZNAME,
+	T4.ZIEL_PFAD,
+	T4.AKTIV,
+	T4.NAMENKONVENTION,
+	T4.OBJEKTTYP,
+	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
+	T5.OBJECT_TITLE as OBJECT_ST_NAME,
+	T4.SEQUENCE
+FROM
+	DD_ECM.dbo.TBDD_USER T,
+	DD_ECM.dbo.TBDD_GROUPS_USER T1,
+	DD_ECM.dbo.TBDD_GROUPS T2,
+	DD_ECM.dbo.TBDD_USRGRP_DOKTYPE T3,
+	DD_ECM.dbo.TBDD_DOKUMENTART T4,
+	IDB.dbo.TBIDB_OBJECT_STORE T5
+WHERE
+	T4.AKTIV = 1 AND
+	T.GUID = T1.[USER_ID] AND
+	T1.GROUP_ID = T2.GUID AND
+	T2.GUID = T3.GROUP_ID AND
+	T3.DOCTYPE_ID = T4.GUID AND
+	T4.IDB_OBJECT_STORE_ID = T5.GUID AND
+
+	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
+UNION
+SELECT DISTINCT
+	T.GUID AS [USER_ID],
+	T.USERNAME,
+	--'' AS GROUP_NAME,
+	T4.GUID as DOCTYPE_ID,
+	T4.BEZEICHNUNG AS DOCTYPE,
+	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
+	T4.KURZNAME,
+	T4.ZIEL_PFAD,
+	T4.AKTIV,
+	T4.NAMENKONVENTION,
+	T4.OBJEKTTYP,
+	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
+	T5.OBJECT_TITLE as OBJECT_ST_NAME,
+	T4.SEQUENCE
+FROM
+	DD_ECM.dbo.TBDD_USER T,
+	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
+	DD_ECM.dbo.TBDD_DOKUMENTART T4,
+	IDB.dbo.TBIDB_OBJECT_STORE T5
+WHERE
+	T4.AKTIV = 1 AND
+	T.GUID = T3.[USER_ID] AND
+	T3.DOCTYPE_ID = T4.GUID AND
+	T4.IDB_OBJECT_STORE_ID = T5.GUID AND
+	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
+GO
+------------------------------------------------------------------------------
+
+
+CREATE OR ALTER VIEW [dbo].[VWGI_DOCTYPE_IDB] AS 
+SELECT 
+	T4.GUID as DOCTYPE_ID,
+	T4.BEZEICHNUNG AS DOCTYPE,
+	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
+	T4.KURZNAME,
+	T4.FOLDER_FOR_INDEX DYNAMIC_FOLDER,
+	T4.AKTIV,
+	T4.NAMENKONVENTION,
+	T4.OBJEKTTYP,
+	T6.OBJECT_TITLE AS OBJECT_STORE,
+	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
+	T7.CAT_TITLE AS OBJECT_ST_PATH,
+	T4.ERSTELLTWANN,
+	T4.GEAENDERTWANN,
+	T4.SEQUENCE,
+	T4.IDB_DOCTYPE_ID
+FROM
+	DD_ECM.dbo.TBDD_DOKUMENTART T4 LEFT JOIN IDB.dbo.TBIDB_OBJECT_STORE T6 ON T4.IDB_OBJECT_STORE_ID = T6.GUID
+	LEFT JOIN IDB.dbo.TBIDB_CATALOG T7 On T6.CAT_ID = T7.GUID
+WHERE
+	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
+GO
+
+
 
 
diff --git a/00_IDB/Search_Logic.sql b/00_IDB/Search_Logic.sql
index 909ace0..a167c6c 100644
Binary files a/00_IDB/Search_Logic.sql and b/00_IDB/Search_Logic.sql differ
diff --git a/00_IDB/Search_TEST.sql b/00_IDB/Search_TEST.sql
index a992f05..655dccd 100644
Binary files a/00_IDB/Search_TEST.sql and b/00_IDB/Search_TEST.sql differ
diff --git a/01_PM/CreateDBObjects.sql b/01_PM/CreateDBObjects.sql
index c757121..e66070b 100644
--- a/01_PM/CreateDBObjects.sql
+++ b/01_PM/CreateDBObjects.sql
@@ -1,8 +1,6 @@
 
 /*##################################
-1.	Search for @MyUSER and replace the username 
-	You use for administration
-2.	If windream database is not located: Search for windream60 and replace with databaselink.windream60
+1.	If windream database is not located: Search for windream60 and replace with databaselink.windream60
 ALTER TABLE TBDD_CONNECTION
 ADD SYS_CONNECTION BIT DEFAULT 0 NOT NULL; 
 GO
@@ -10,11 +8,10 @@ GO
 
 UPDATE TBDD_MODULES SET DB_VERSION = '2.2.0.0' where NAME = 'Process-Manager'
 GO
-INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,IS_ADMIN) SELECT GUID,(SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'PM'),1 FROM TBDD_USER  where  UPPER(USERNAME) = UPPER('@MyUSER')
-GO
-INSERT INTO TBDD_CLIENT_USER (USER_ID,CLIENT_ID) SELECT GUID,1 FROM TBDD_USER WHERE GUID NOT IN (SELECT USER_ID FROM TBDD_CLIENT_USER WHERE CLIENT_ID = 1)
-GO
-INSERT INTO TBDD_GROUPS_USER (USER_ID,GROUP_ID) VALUES ((SELECT GUID FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER('@MyUSER')),(SELECT GUID FROM TBDD_GROUPS WHERE NAME = 'PM_ADMINS'))
+INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,IS_ADMIN) SELECT GUID,(SELECT GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'PM'),1 FROM TBDD_USER  where  USERNAME IN (SELECT USR_NAME FROM TBIMPORT_USER);
+INSERT INTO TBDD_CLIENT_USER (USER_ID,CLIENT_ID) SELECT GUID,1 FROM TBDD_USER WHERE GUID NOT IN (SELECT USER_ID FROM TBDD_CLIENT_USER WHERE CLIENT_ID = 1);
+INSERT INTO TBDD_GROUPS_USER (USER_ID,GROUP_ID) 
+	SELECT GUID,(SELECT GUID FROM TBDD_GROUPS WHERE NAME = 'PM_ADMINS') FROM TBDD_USER WHERE USERNAME IN (SELECT USR_NAME FROM TBIMPORT_USER)
 GO
 CREATE TABLE TBPM_KONFIGURATION
 (
diff --git a/01_PM/Updates/2.2.1.0.sql b/01_PM/Updates/2.2.1.0.sql
new file mode 100644
index 0000000..ba9bca4
--- /dev/null
+++ b/01_PM/Updates/2.2.1.0.sql
@@ -0,0 +1,17 @@
+UPDATE TBDD_MODULES SET DB_VERSION = '2.2.1.0' where NAME = 'Process-Manager'
+GO
+
+ALTER TABLE TBPM_CONTROL_TABLE ADD LU_CAPTION VARCHAR(150) NOT NULL DEFAULT 'NONE'
+GO
+CREATE TABLE TBPM_VALIDATION_PROFILE_GROUP_USER
+(
+	GUID           			BIGINT		IDENTITY(1,1),
+	PROFIL_ID				INTEGER		NOT NULL,
+	DocID					BIGINT		NOT NULL,
+	UserID					INTEGER		NOT NULL,
+	ADDED_WHO				VARCHAR(100)		DEFAULT 'SYSTEM'	NOT NULL,
+	ADDED_WHEN				DATETIME 		DEFAULT GETDATE(),
+	CONSTRAINT	PK_TBPM_VALIDATION_PROFILE_GROUP_USER PRIMARY KEY(GUID),
+	CONSTRAINT	UQ_TBPM_VALIDATION_PROFILE_GROUP_USER UNIQUE (PROFIL_ID,DocID,UserID)
+)
+GO
\ No newline at end of file
diff --git a/02_GI/CreateDBObjects.sql b/02_GI/CreateDBObjects.sql
index b4bd937..7f011da 100644
--- a/02_GI/CreateDBObjects.sql
+++ b/02_GI/CreateDBObjects.sql
@@ -314,22 +314,22 @@ SELECT DISTINCT
 	T4.NAMENKONVENTION,
 	T4.OBJEKTTYP,
 	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
-	T5.OBJECT_TITLE as OBJECT_ST_NAME,
+	--T5.OBJECT_TITLE as OBJECT_ST_NAME,
 	T4.SEQUENCE
 FROM
 	DD_ECM.dbo.TBDD_USER T,
 	DD_ECM.dbo.TBDD_GROUPS_USER T1,
 	DD_ECM.dbo.TBDD_GROUPS T2,
 	DD_ECM.dbo.TBDD_USRGRP_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4,
-	IDB.dbo.TBIDB_OBJECT_STORE T5
+	DD_ECM.dbo.TBDD_DOKUMENTART T4--,
+	--IDB.dbo.TBIDB_OBJECT_STORE T5
 WHERE
 	T4.AKTIV = 1 AND
 	T.GUID = T1.[USER_ID] AND
 	T1.GROUP_ID = T2.GUID AND
 	T2.GUID = T3.GROUP_ID AND
 	T3.DOCTYPE_ID = T4.GUID AND
-	T4.IDB_OBJECT_STORE_ID = T5.GUID AND
+	--T4.IDB_OBJECT_STORE_ID = T5.GUID AND
 
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 UNION
@@ -346,18 +346,18 @@ SELECT DISTINCT
 	T4.NAMENKONVENTION,
 	T4.OBJEKTTYP,
 	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
-	T5.OBJECT_TITLE as OBJECT_ST_NAME,
+	--T5.OBJECT_TITLE as OBJECT_ST_NAME,
 	T4.SEQUENCE
 FROM
 	DD_ECM.dbo.TBDD_USER T,
 	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4,
-	IDB.dbo.TBIDB_OBJECT_STORE T5
+	DD_ECM.dbo.TBDD_DOKUMENTART T4--,
+	--IDB.dbo.TBIDB_OBJECT_STORE T5
 WHERE
 	T4.AKTIV = 1 AND
 	T.GUID = T3.[USER_ID] AND
 	T3.DOCTYPE_ID = T4.GUID AND
-	T4.IDB_OBJECT_STORE_ID = T5.GUID AND
+	--T4.IDB_OBJECT_STORE_ID = T5.GUID AND
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
 ------------------------------------------------------------------------------
@@ -520,16 +520,16 @@ SELECT
 	T4.AKTIV,
 	T4.NAMENKONVENTION,
 	T4.OBJEKTTYP,
-	T6.OBJECT_TITLE AS OBJECT_STORE,
+	--T6.OBJECT_TITLE AS OBJECT_STORE,
 	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
-	T7.CAT_TITLE AS OBJECT_ST_PATH,
+	--T7.CAT_TITLE AS OBJECT_ST_PATH,
 	T4.ERSTELLTWANN,
 	T4.GEAENDERTWANN,
-	T4.SEQUENCE,
-	T4.IDB_DOCTYPE_ID
+	T4.SEQUENCE--,
+	--T4.IDB_DOCTYPE_ID
 FROM
-	DD_ECM.dbo.TBDD_DOKUMENTART T4 LEFT JOIN IDB.dbo.TBIDB_OBJECT_STORE T6 ON T4.IDB_OBJECT_STORE_ID = T6.GUID
-	LEFT JOIN IDB.dbo.TBIDB_CATALOG T7 On T6.CAT_ID = T7.GUID
+	DD_ECM.dbo.TBDD_DOKUMENTART T4 --LEFT JOIN IDB.dbo.TBIDB_OBJECT_STORE T6 ON T4.IDB_OBJECT_STORE_ID = T6.GUID
+	--LEFT JOIN IDB.dbo.TBIDB_CATALOG T7 On T6.CAT_ID = T7.GUID
 WHERE
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
diff --git a/02_GI/Updates/2.5.0.0.sql b/02_GI/Updates/2.5.0.0.sql
index 36876e3..542daea 100644
--- a/02_GI/Updates/2.5.0.0.sql
+++ b/02_GI/Updates/2.5.0.0.sql
@@ -13,6 +13,3 @@ ALTER TABLE TBGI_HISTORY ALTER COLUMN INDEX8 VARCHAR(250)
 ALTER TABLE TBGI_HISTORY ALTER COLUMN INDEX9 VARCHAR(250)
 ALTER TABLE TBGI_HISTORY ALTER COLUMN INDEX10 VARCHAR(250)
 GO
-
-ALTER TABLE TBGI_FILES_USER ADD FILE_HASH VARCHAR(100) NULL
-GO
\ No newline at end of file
diff --git a/02_GI/Updates/2.5.2.0.sql b/02_GI/Updates/2.5.2.0.sql
index 9cb289b..b397a9e 100644
--- a/02_GI/Updates/2.5.2.0.sql
+++ b/02_GI/Updates/2.5.2.0.sql
@@ -15,7 +15,7 @@ SELECT DISTINCT
 	T4.AKTIV,
 	T4.NAMENKONVENTION,
 	T4.OBJEKTTYP,
-	T4.IDB_FILESTORE_ID,
+	--T4.IDB_FILESTORE_ID,
 	T4.SEQUENCE
 FROM
 	TBDD_USER T,
@@ -43,7 +43,7 @@ SELECT DISTINCT
 	T4.AKTIV,
 	T4.NAMENKONVENTION,
 	T4.OBJEKTTYP,
-	T4.IDB_FILESTORE_ID,
+	--T4.IDB_FILESTORE_ID,
 	T4.SEQUENCE
 FROM
 	TBDD_USER T,
diff --git a/07_UserManager/CreateDBObjects.sql b/07_UserManager/CreateDBObjects.sql
index 9638a5e..533ffe6 100644
--- a/07_UserManager/CreateDBObjects.sql
+++ b/07_UserManager/CreateDBObjects.sql
@@ -1,20 +1,9 @@
-
-/*##################################
-1.	Search for @INSTALL_ADMIN_USER and replace the username You use for adminsitration
-####################################*/
-
 UPDATE TBDD_MODULES SET PRODUCT_VERSION = '1.0.0.1' where SHORT_NAME = 'UM'
 GO
 BEGIN
 	IF NOT EXISTS (SELECT 1 FROM TBDD_GROUPS WHERE NAME = 'UM_ADMINS')
 		INSERT INTO TBDD_GROUPS (NAME,INTERNAL) VALUES ('UM_ADMINS',1);
 END
-DECLARE @MY_INSTALL_ADMIN_USER VARCHAR(50)
-SET @MY_INSTALL_ADMIN_USER = '@INSTALL_ADMIN_USER'
-IF NOT EXISTS(SELECT GUID FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER(@MY_INSTALL_ADMIN_USER))
-	INSERT INTO TBDD_USER(PRENAME,NAME,USERNAME) VALUES 
-	('DefPrename','DefSurname',@MY_INSTALL_ADMIN_USER)
-GO
 
 ALTER TABLE [dbo].[TBDD_GROUPS_USER] DROP CONSTRAINT [FK_TBDD_GROUPS_USER_GROUP_ID]
 GO
@@ -25,16 +14,10 @@ GO
 ALTER TABLE [dbo].[TBDD_GROUPS_USER] CHECK CONSTRAINT [FK_TBDD_GROUPS_USER_GROUP_ID]
 GO
 
-
-
-DECLARE @MY_INSTALL_ADMIN_USER VARCHAR(50)
-SET @MY_INSTALL_ADMIN_USER = '@INSTALL_ADMIN_USER'
-DECLARE @USERID Int
-SELECT @USERID = GUID FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER(@MY_INSTALL_ADMIN_USER)
 DECLARE @UM_GROUP_ID INT 
 SELECT @UM_GROUP_ID = GUID FROM  TBDD_GROUPS WHERE NAME = 'UM_ADMINS'
-IF NOT EXISTS(SELECT GUID FROM TBDD_GROUPS_USER WHERE USER_ID = @USERID AND GROUP_ID = @UM_GROUP_ID)
-	INSERT INTO TBDD_GROUPS_USER (GROUP_ID,USER_ID) VALUES (@UM_GROUP_ID,@USERID)
+INSERT INTO TBDD_GROUPS_USER (GROUP_ID,USER_ID)
+	SELECT @UM_GROUP_ID,B.GUID FROM TBIMPORT_USER A INNER JOIN TBDD_USER B ON A.USR_NAME = B.USERNAME
 GO
 --if not exists (select * from sysobjects where name='TBDD_GROUPS_MODULES' and xtype='U')  
 --CREATE TABLE TBDD_GROUPS_MODULES
diff --git a/09_ZooFlow/Update/1.0.0.1.sql b/09_ZooFlow/Update/1.0.0.1.sql
index 57f1c1f..80ac3d0 100644
Binary files a/09_ZooFlow/Update/1.0.0.1.sql and b/09_ZooFlow/Update/1.0.0.1.sql differ
diff --git a/10_Monitor/CreateDBObjects.sql b/10_Monitor/CreateDBObjects.sql
index ee09a3e..16c5399 100644
--- a/10_Monitor/CreateDBObjects.sql
+++ b/10_Monitor/CreateDBObjects.sql
@@ -1,12 +1,12 @@
-DROP TABLE TBMON_PROFILE_PARAM;
-DROP TABLE TBMON_PROFILE;
+--DROP TABLE TBMON_PROFILE_PARAM;
+--DROP TABLE TBMON_PROFILE;
 CREATE TABLE TBMON_PROFILE
 (
 	GUID			INTEGER			NOT NULL	IDENTITY (1, 1),
 	TITLE			VARCHAR(250)	NOT NULL,
 	CAPTION			VARCHAR(250),
 	EXEC_SQL		NVARCHAR(MAX),
-	RETURN_TYPE		VARCHAR(100)	NOT NULL,
+	RETURN_TYPE		VARCHAR(100)	NOT NULL,	--TreeView or Table
 	COMMENT			VARCHAR(500),
 	ACTIVE			BIT				NOT NULL	DEFAULT 1,
 	ADDED_WHO	    VARCHAR(100)    NOT NULL    DEFAULT 'System',