diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cfd501..16eda23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.8.4-SNAPSHOT] - 2020-12-14
+
+Fix Bug #20337 infrastructure-monitor: the searchById doesn't work anymore
+
 ## [v2.8.3] - 2020-09-25
 
 Ported to git and revised xqueries to support new Exists DB version
diff --git a/pom.xml b/pom.xml
index cd174a0..b4b8978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>rmp-common-library</artifactId>
-	<version>2.8.3</version>
+	<version>2.8.4-SNAPSHOT</version>
 	<name>Resource Management Library</name>
 	<description>
 		gCube Resource Management Library is a common library containing shared code for Information System Operations 
diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
index 6590a52..9a394d6 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
@@ -1,7 +1,4 @@
 declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
-let $_res_type := '<RES_TYPE ISdefault ='' />' 
-let $_res_id := '<RES_ID/>'
-let $res_type := if (empty($_res_type)) then $_res_id else concat($_res_type, '/', $_res_id )
-let $res_docname := concat('/db/Profiles/',$res_type)
-let $res := doc($res_docname)//Document/Data/ic:Profile/Resource
-return $res
\ No newline at end of file
+for $resource in collection('/db/Profiles/<RES_TYPE ISdefault ='' />')//Document/Data/ic:Profile/Resource
+where $resource/ID/string() eq '<RES_ID/>'
+return $resource
\ No newline at end of file