mflorea

diff --git a/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/DocumentInformation.xml b/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/DocumentInformation.xml
index ec9ba03..95eec0b 100644
--- a/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/DocumentInformation.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/src/main/resources/Panels/DocumentInformation.xml
@@ -434,6 +434,10 @@
   : [[$page>>$page]] [[[[image:icon:page_white_edit||alt="$msg.get('panels.documentInformation.editIncluded', [$page])"]]>>path:$xwiki.getURL($page, 'edit')]]
   #end
 #end
+
+{{html}}
+#template('tagedit.vm')
+{{/html}}
 #panelfooter()
 {{/velocity}}</content>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/tagedit.vm b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/tagedit.vm
index 6d9a0c2..601e6a8 100644
--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/tagedit.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/tagedit.vm
@@ -7,15 +7,17 @@
       <dt><label for="tags">$msg.get("core.tagedit.title")</label></dt>
       <dd><input type="text" id="tags" name="tags" value="$!tdoc.tags"/></dd>
       </dl>
-      <div id="tag_possibilities" style="display:none">
-      Available tags for this document
-      <ul>
-      #foreach($tag in $possibleTags)
-        <li class="inline tag"><a onclick="addTag('$tag')">$tag</a></li>
-      #end
-      </ul>
-      </div>
-      <script type="text/javascript">{pre}
+      <dl id="tag_possibilities" style="display:none">
+        <dt><label for="tags">Available tags for this document</label></dt>
+        <dd>
+          <ul>
+          #foreach($tag in $possibleTags)
+            <li class="inline tag"><a onclick="addTag('$tag')">$tag</a></li>
+          #end
+          </ul>
+        </dd>
+      </dl>
+      <script type="text/javascript">
   // <![CDATA[
       function addTag(tagName){
         selectTag(tagName);
@@ -74,7 +76,7 @@
       }
       initTagScript();
   // ]]>
-      {/pre}</script>
+      </script>
     #else ## displayType != input && displayType != select
       #set($existingTags = [])
       #foreach($tag in $!tdoc.tags.split("[|]"))
@@ -83,9 +85,13 @@
       <dl id="selectedTagsForm">
       <dt><label for="tags">$msg.get("core.tagedit.title")</label></dt>
       #foreach($tag in $possibleTags)
-        <dd><label for="tags"><input type="checkbox"#if($existingTags.contains($tag)) checked="checked"#end id="tags" name="tags" value="$!tag"/> $tag</label></dd>
+        <dd><label for="tags$velocityCount"><input type="checkbox"#if($existingTags.contains($tag)) checked="checked"#end id="tags$velocityCount" name="tags" value="$!tag"/> $tag</label></dd>
       #end
       </dl>
+      <div class="hidden">
+        ## In case no tag is selected.
+        <input type="hidden" value="" name="tags">
+      </div>
     #end
   #else ## displayType == input
     #set($path = $xwiki.getURL("Main.WebHome", "view"))