diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
index f7e00ecb..0f33201f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
@@ -146,10 +146,6 @@ public class MindmapManagerImpl
 
             hibernateCriteria.add(junction);
         }
-//        if (maxResult>0)
-//        {
-//            hibernateCriteria.setMaxResults(maxResult);
-//        }
         return hibernateCriteria.list();
     }
 
@@ -160,7 +156,7 @@ public class MindmapManagerImpl
 
     @Override
     public List<Collaboration> findCollaboration(final long collaboratorId) {
-        Query query = currentSession().createQuery("from com.wisemapping.model.Collaboration collaboration where colaboratorId=:colaboratorId");
+        Query query = currentSession().createQuery("from com.wisemapping.model.Collaboration collaboration where colaborator_id=:colaboratorId");
         query.setParameter("colaboratorId", collaboratorId);
         return query.list();
     }
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java b/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java
index d347261d..e3a1d7f3 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java
@@ -4,7 +4,7 @@ import com.wisemapping.filter.SupportedUserAgent;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-@Test
+@Test(enabled=false)
 public class UserAgentTest {