diff --git a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js
index 83b1eec369..a3e840db3c 100644
--- a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js
+++ b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.panel.js
@@ -87,7 +87,7 @@ Sonia.group.Panel = Ext.extend(Sonia.rest.Panel, {
   },
   
   updateHistory: function(group){
-    var token = Sonia.History.createToken(['groupPanel', group.name]);
+    var token = Sonia.History.createToken('groupPanel', group.name);
     Sonia.History.add(token);
   },
 
@@ -173,7 +173,7 @@ Sonia.History.register('groupPanel', {
   onActivate: function(panel){
     var token = null;
     var rec = panel.getGrid().getSelectionModel().getSelected();
-    if ( rec != null ){
+    if (rec){
       token = Sonia.History.createToken('groupPanel', rec.get('name'));
     } else {
       token = Sonia.History.createToken('groupPanel');
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js
index 54d186b139..28be95d035 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js
@@ -164,7 +164,7 @@ Sonia.repository.Panel = Ext.extend(Sonia.rest.Panel, {
   },
   
   updateHistory: function(item){
-    var token = Sonia.History.createToken(['repositoryPanel', item.id]);
+    var token = Sonia.History.createToken('repositoryPanel', item.id);
     Sonia.History.add(token);
   },
   
@@ -282,7 +282,7 @@ Sonia.History.register('repositoryPanel', {
   onActivate: function(panel){
     var token = null;
     var rec = panel.getGrid().getSelectionModel().getSelected();
-    if ( rec != null ){
+    if (rec){
       token = Sonia.History.createToken('repositoryPanel', rec.get('id'));
     } else {
       token = Sonia.History.createToken('repositoryPanel');
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.history.js b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
index 314409c920..2225416692 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.history.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
@@ -51,18 +51,14 @@ Sonia.History = {
     }
   },
   
-  createToken: function(elements){
+  createToken: function(){
     var token = '';
-    if (Ext.isArray(elements)){
-      for (var i=0; i<elements.length; i++){
-        token += elements[i];
-        if ( (i+1)<elements.length ){
-          token += '|';
-        }
+    for (var i=0; i<arguments.length; i++){
+      token += arguments[i];
+      if ( (i+1)<arguments.length ){
+        token += '|';
       }
-    } else {
-      token = elements;
-    }
+    }    
     return token;
   },