diff --git a/js/twister_actions.js b/js/twister_actions.js
index 83ec131..9bf55d1 100644
--- a/js/twister_actions.js
+++ b/js/twister_actions.js
@@ -326,10 +326,12 @@ function newShortURI(uri, cbFunc, cbReq) {
         return;
     }
 
-    for (var i in twister.URIs)
-        if (twister.URIs[i] === uri) {
+    for (var short in twister.URIs)
+        if (twister.URIs[short] instanceof Array ?
+            twister.URIs[short][0] === uri : twister.URIs[short] === uri) {
             if (typeof cbFunc === 'function')
-                cbFunc(uri, i, cbReq);
+                cbFunc(uri, short, cbReq);
+
             return;
         }