diff --git a/src/dal/widgets.py b/src/dal/widgets.py
index 2a05c8ab..8f0bb237 100644
--- a/src/dal/widgets.py
+++ b/src/dal/widgets.py
@@ -87,7 +87,7 @@ def render_forward_conf(self, id):
         if self.forward:
             return \
                 '<div style="display:none" class="dal-forward-conf" ' + \
-                'id="dal-forward-conf-for_{id}"'.format(id=id) + \
+                'id="dal-forward-conf-for_{id}"'.format(id=self.attrs.get("id", id)) + \
                 '>' \
                 '<script type="text/dal-forward-conf">' + \
                 json.dumps(
diff --git a/src/dal_select2/static/autocomplete_light/select2.js b/src/dal_select2/static/autocomplete_light/select2.js
index d3c5c742..fcf73b32 100644
--- a/src/dal_select2/static/autocomplete_light/select2.js
+++ b/src/dal_select2/static/autocomplete_light/select2.js
@@ -30,7 +30,9 @@ document.addEventListener('dal-init-function', function () {
                 return $result.text(item.text);
               }
             } else {
-                return template(item.text, is_data_html);
+                let text = item.text;
+                if (item.selected) text = escape(text);
+                return template(text, is_data_html);
             }
         }