diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index c82b113..777dd0c 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -379,8 +379,13 @@
     "description": "The label for this element (debug page)"
   },
 
-  "debugPage_inputSearchPattern": {
-    "message": "Search Pattern:",
+  "debugPage_inputLinkSearchPattern": {
+    "message": "Link Search Pattern:",
+    "description": "The label for this element (debug page)"
+  },
+
+  "debugPage_inputLinkAttribute": {
+    "message": "Link Attribute:",
     "description": "The label for this element (debug page)"
   },
 
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 319912e..23d3fa7 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -379,8 +379,13 @@
     "description": "L'étiquette pour cet élément (page de débogage)"
   },
 
-  "debugPage_inputSearchPattern": {
-    "message": "Modèle de Recherche :",
+  "debugPage_inputLinkSearchPattern": {
+    "message": "Modèle de Recherche de Liens :",
+    "description": "L'étiquette pour cet élément (page de débogage)"
+  },
+
+  "debugPage_inputLinkAttribute": {
+    "message": "Attribut pour les Liens :",
     "description": "L'étiquette pour cet élément (page de débogage)"
   },
 
diff --git a/src/html/debug.html b/src/html/debug.html
index 257a613..1942c5d 100644
--- a/src/html/debug.html
+++ b/src/html/debug.html
@@ -120,12 +120,16 @@
 		<br /><input type="text" id="interceptor1" />
 
 		<br /><br />
-		<label for="search-pattern" class="important" data-i18n="debugPage_inputSearchPattern"></label>
-		<br /><input type="text" id="search-pattern" />
+		<label for="link-search-pattern" class="important" data-i18n="debugPage_inputLinkSearchPattern"></label>
+		<br /><input type="text" id="link-search-pattern" />
 
 		<br /><br />
 		<label for="interceptor2" class="important" data-i18n="debugPage_inputInterceptor2">Interceptor 2:</label>
 		<br /><input type="text" id="interceptor2" />
+		
+		<br /><br />
+		<label for="link-attribute" class="important" data-i18n="debugPage_inputLinkAttribute"></label>
+		<br /><input type="text" id="link-attribute" />
 
 		<br /><br />
 		<span data-i18n="debugPage_youCanAlso"></span>
@@ -144,7 +148,7 @@
 	<div class="section" id="exportSection">
 		<span data-i18n="debugPage_intro"></span>
 		<br /><br />
-		<pre id="xml-catalog" onclick="selectDictionaryItem()"></pre>
+		<pre id="xml-catalog"></pre>
 		<br /><br />
 		<button id="backButton" data-i18n="debugPage_backButton"></button>
 	</div>
diff --git a/src/scripts/content/debug.js b/src/scripts/content/debug.js
index 5b8acbf..bc00140 100644
--- a/src/scripts/content/debug.js
+++ b/src/scripts/content/debug.js
@@ -1,5 +1,6 @@
 
 var dictionaryItems = [];
+var dictionaryItemIsSelected = false;
 browser.runtime.sendMessage({req: 'get-dictionary'});
 browser.runtime.onMessage.addListener(request => {
 
@@ -18,6 +19,7 @@ document.querySelector('#simulateButton').addEventListener('click', showFeedback
 document.querySelector('#backButton').addEventListener('click', backToForm);
 document.querySelector('#exportButton').addEventListener('click', showExportSection);
 document.querySelector('#dictionary-items').addEventListener('change', fillInItemProperties);
+document.querySelector('#xml-catalog').addEventListener('click', selectDictionaryItem);
 
 
 // Functions
@@ -32,6 +34,24 @@ function backToForm() {
 }
 
 
+/**
+ * Updates the selection when exporting a catalog item.
+ * @returns {undefined}
+ */
+function selectDictionaryItem() {
+
+  var selection = window.getSelection();
+  selection.removeAllRanges();
+  dictionaryItemIsSelected = ! dictionaryItemIsSelected;
+
+  if (dictionaryItemIsSelected) {
+    var range = document.createRange();
+    range.selectNodeContents(document.querySelector('#xml-catalog'));
+    selection.addRange(range);
+  }
+}
+
+
 /**
  * Shows the export section.
  * @returns {undefined}
@@ -54,11 +74,11 @@ function showExportSection() {
     if (firstPos === item.length - 1) {
       highlight(xmlCatalog, 'xml-markup', item.substring(0));
     } else {
-      highlight(xmlCatalog, 'xml-markup', '  ' + item.substring(0, firstPos + 1));
-      xmlCatalog.appendChild( document.createElement('br'));
-      highlight(xmlCatalog, '', '  ' + item.substring(firstPos + 1, endPos));
-      xmlCatalog.appendChild( document.createElement('br'));
-      highlight(xmlCatalog, 'xml-markup', '  ' + item.substring(endPos));
+      highlight(xmlCatalog, 'xml-markup', '\t' + item.substring(0, firstPos + 1));
+      //xmlCatalog.appendChild( document.createElement('br'));
+      highlight(xmlCatalog, '', item.substring(firstPos + 1, endPos));
+      //xmlCatalog.appendChild( document.createElement('br'));
+      highlight(xmlCatalog, 'xml-markup', item.substring(endPos));
     }
   });
 
@@ -84,7 +104,6 @@ function highlight(xmlCatalog, className, content) {
 }
 
 
-
 /**
  * Loads the current dictionary in the side bar.
  * @returns {undefined}
@@ -132,7 +151,8 @@ function fillInItemProperties() {
       if (item.id === selected) {
 
         // Simple fields
-        document.querySelector('#search-pattern').value = item.searchPattern;
+        document.querySelector('#link-search-pattern').value = item.searchPattern;
+        document.querySelector('#link-attribute').value = item.linkAttribute || '';
         document.querySelector('#path-pattern').value = item.pathPattern;
 
         // The domain is special
@@ -218,19 +238,49 @@ function simulateAction() {
  */
 function buildDictionaryItem() {
 
-  var dictionaryAsString = '<host id="x">';
-  var suffix = document.querySelector('#domain-is-regexp').checked ? '-pattern' : '';
-  dictionaryAsString += '\n<domain' + suffix + '>' + document.querySelector('#domain').value + '</domain' + suffix + '>';
-  dictionaryAsString += '\n<path-pattern><![CDATA[' + document.querySelector('#path-pattern').value + ']]></path-pattern>';
+  var domain = document.querySelector('#domain').value;
+  var pathPattern = wrapWithCData(document.querySelector('#path-pattern').value);
+  var linkSearchPattern = wrapWithCData(document.querySelector('#link-search-pattern').value);
+  var linkAttribute = document.querySelector('#link-attribute').value;
+
+  var domainIsRegexp = document.querySelector('#domain-is-regexp').checked;
+  var id = domainIsRegexp ? 'x' : domain.replace(/\..*/i, '');
+  var suffix = domainIsRegexp ? '-pattern' : '';
+
+  var dictionaryAsString = '<host id="' + id + '">';
+  dictionaryAsString += '\n<domain' + suffix + '>' + domain + '</domain' + suffix + '>';
+  dictionaryAsString += '\n<path-pattern>' + pathPattern + '</path-pattern>';
   if (document.querySelector('#interceptor1').value.trim().length !== 0) {
     dictionaryAsString += '\n<interceptor>' + document.querySelector('#interceptor1').value + '</interceptor>';
   }
 
-  dictionaryAsString += '\n<search-pattern><![CDATA[' + document.querySelector('#search-pattern').value + ']]></search-pattern>';
+  dictionaryAsString += '\n<link-search-pattern>' + linkSearchPattern + '</link-search-pattern>';
   if (document.querySelector('#interceptor2').value.trim().length !== 0) {
     dictionaryAsString += '\n<interceptor>' + document.querySelector('#interceptor2').value + '</interceptor>';
   }
 
+  if (!! linkAttribute) {
+    dictionaryAsString += '\n<link-attribute>' + linkAttribute + '</link-attribute>';
+  }
+
   dictionaryAsString += '\n</host>';
   return dictionaryAsString;
 }
+
+
+/**
+ * Wraps a text in a CDATA section when necessary.
+ * @param {string} content A text content.
+ * @returns {string} The same string, possibly wrapped in a CDATA section.
+ */
+function wrapWithCData(content) {
+
+  var res = content;
+  if (res.indexOf('<') !== -1 ||
+      res.indexOf('>') !== -1 ||
+      res.indexOf('&') !== -1) {
+    res = '<![CDATA[' + content + ']]>';
+  }
+
+  return res;
+}