diff --git a/patches/patch20200415-3.0.0/versioning.sql b/patches/patch20200415-3.0.0/versioning.sql
index 7818f7d08bc9537b2af07f8de7a236929b3a7b13..d1e9450078d54c4148d29e66f818af4bf7210e45 100644
--- a/patches/patch20200415-3.0.0/versioning.sql
+++ b/patches/patch20200415-3.0.0/versioning.sql
@@ -333,7 +333,6 @@ CREATE PROCEDURE setFileProperties (
 )
 BEGIN
     DECLARE IVersion INT UNSIGNED DEFAULT NULL;
-
     IF is_feature_config("ENTITY_VERSIONING", "ENABLED") THEN
         SELECT max(e._iversion) INTO IVersion
             FROM entity_version AS e
@@ -398,3 +397,5 @@ END //
 
 
 delimiter ;
+
+INSERT INTO feature_config (_key, _value) VALUES ("ENTITY_VERSIONING", "ENABLED");
diff --git a/procedures/retrieveEntityParents.sql b/procedures/retrieveEntityParents.sql
index bbde5dbc8dfb267763edeebcc086bbaf49fa8bc2..74c7f67fb0eb85f477fd6ccd1f0d148bc1b161eb 100644
--- a/procedures/retrieveEntityParents.sql
+++ b/procedures/retrieveEntityParents.sql
@@ -85,7 +85,8 @@ retrieveEntityParentsBody: BEGIN
                 JOIN entities AS e
                 ON (i.parent = e.id)
                 WHERE i.child = EntityID
-                AND i.child_iversion = IVersion;
+                AND i.child_iversion = IVersion
+                AND i.rpath = EntityID;
 
             LEAVE retrieveEntityParentsBody;
         END IF;
@@ -101,7 +102,7 @@ retrieveEntityParentsBody: BEGIN
         JOIN entities AS e
         ON (i.parent = e.id)
         WHERE i.child = EntityID
-        AND i.rpath = CAST(EntityID AS CHAR) COLLATE utf8_unicode_ci;
+        AND i.rpath = EntityID;
 END
 //