diff --git a/templates/html/common/wizefunc.js b/templates/html/common/wizefunc.js
index afde500..ec1303b 100644
--- a/templates/html/common/wizefunc.js
+++ b/templates/html/common/wizefunc.js
@@ -45,20 +45,31 @@
     /* Convert the two first tags into info */
     /* use tags for image/table/object attributes        */
     function tagToInfo() {
-        var tags = document.getElementsByClassName('zim-tag');
+        /* All H5 tags */
+        var atags = document.getElementsByTagName('H5');
+        /* extract configuration tags */
+        tags=[];
+        for (var i=0; i<atags.length;i++) {
+            var s = atags[i].innerHTML;
+            if (s.match(/^#/)) {
+                atags[i].innerHTML = s.replace('#','');
+                tags.push(atags[i]);
+            }
+        }
+                
         var n = tags.length < 3 ? tags.length : 2;
         for (var i=1; i <= n; i++) {
+            /* first make the tag not displayed */
+            tags[i-1].setAttribute("style","display:none;");
             var s = tags[i-1].innerHTML;
-            s = s.replace('@','');
-            s = s.replace(/_/g,' ');
             document.getElementById("footinfo"+i).innerHTML = s;
         }
         if (tags.length > 2) {
             /* Image tags */
             for (var i=1; i <= tags.length - 2; i++) {
                 var ctag = tags[i+1];
+                ctag.setAttribute("style","display:none;");
                 var s = ctag.innerHTML;
-                s = s.replace('@','');
                 /* find next img/table/zim-object */                
                 ctag = findNextObject(ctag);
                 
@@ -92,7 +103,7 @@
 
     function findNextObject(tag) {
         /* try to found in current */
-        var objectsTagClassArray=['IMG','','TABLE','','DIV','zim-object'];
+        var objectsTagClassArray=['IMG','','TABLE','','DIV','zim-object','UL','','OL',''];
         ob = findTagInSiblings(tag,objectsTagClassArray);
         if (ob == null) {
             ob = findTagInSiblings(tag.parentElement,objectsTagClassArray);
@@ -103,24 +114,46 @@
     function findTagInSiblings(tag,tagsToFind) {
         var notFound = true;
         var ctag = tag;
+        var cctag;
         while (notFound) {
             ctag = ctag.nextElementSibling
             if (ctag == null) {
                 notFound = false;
                 break;
-            }            
-            for (var i=0 ; i < tagsToFind.length/2 ; i++) {
-                if (ctag.tagName == tagsToFind[i*2]) {
-                    /* we(ve got the tag */
-                    if (tagsToFind[i*2+1]=='') {
-                        notFound = false;
-                        break;
-                    } else if (ctag.className == tagsToFind[i*2+1]) {
+            }
+            if (isTagInList(ctag,tagsToFind)) {
+                notFound = false;
+                break;
+            }
+            /* now search into children */
+            if (ctag.childElementCount != 0) {
+                for (var i=0;i<ctag.childElementCount;i++) {
+                    cctag=ctag.children[i];
+                    if (isTagInList(cctag,tagsToFind)) {
                         notFound = false;
+                        ctag=cctag;
                         break;
-                    }                                      
+                    }
                 }
-            }                            
+            }
         }        
         return ctag;
     }
+
+    function isTagInList(tag,tagsToFind) {
+        yes = false;
+        for (var i=0; i < tagsToFind.length/2 ; i++) {
+            if (tag.tagName == tagsToFind[i*2]) {
+                if (tagsToFind[i*2+1]=='') {
+                    yes = true;
+                    break;
+                } else if (tag.className == tagsToFind[i*2+1]) {
+                    yes = true;
+                    break;
+                }                
+            }
+        }                
+        return yes;
+    }
+    
+