diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
index 9643882718518b2e61635f39062f60277680fc1f..66e51020725ab0f2a654395dfac89f4341000acb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
@@ -30,6 +30,7 @@ import ch.systemsx.cisd.openbis.plugin.query.client.web.client.IQueryClientServi
 import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.QueryModule;
 import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.QueryParameterValue;
+import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.locator.QueryLocatorResolver;
 
 /**
  * Main menu of {@link QueryModule}.
@@ -68,7 +69,7 @@ public class QueryModuleDatabaseMenuItem extends MenuItem
             @Override
             public String tryGetLink()
             {
-                return null; // TODO 2010-10-11, Piotr Buczek: return link to queries
+                return QueryLocatorResolver.createQueryBrowserLink();
             }
         },
         RUN_CUSTOM_QUERY("Run Custom SQL Query")
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
index 503b58727f599f109d80732e9939d37f249a6b9e..dfe8336a1867e06748080421dea240c61bb24632 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
@@ -228,7 +228,7 @@ public class SampleDetailsTest extends GenericSystemTestCase
                         INDIRECTLY_CONNECTED_DATA_SET_CODE);
         checkDataSet(indirectlyConnectedDataSet, INDIRECTLY_CONNECTED_DATA_SET_CODE, null,
                 CELL_PLATE_EXAMPLE_EXPERIMENT_ID, "3VPROPRIETARY", "analysis/result");
-        // TODO 2010-21-09, Piotr Buczek: check datasets connected to a different experiment
+        // TODO 2010-09-21, Piotr Buczek: check datasets connected to a different experiment
     }
 
     private void checkUserProperty(List<IEntityProperty> properties, String propertyCode,