diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
index e5f8d70d6..b48ddc73b 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
@@ -207,7 +207,7 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep {
         @PathParam(MvcAssetEditSteps.ASSET_PATH_PATH_PARAM_NAME)
         final String assetPath,
         @PathParam("locale") final String localeParam,
-        @PathParam("value") final String value
+        @FormParam("value") final String value
     ) {
         try {
             init();
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStepResources.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStepResources.java
index 9ac28f8ba..5db2d541d 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStepResources.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStepResources.java
@@ -59,7 +59,7 @@ public class SideNoteEditStepResources {
     private AssetPermissionsChecker assetPermissionsChecker;
 
     @GET
-    @Path("/variants/wordcount/{locale}")
+    @Path("/text/variants/wordcount/{locale}")
     @Produces(MediaType.TEXT_HTML)
     @Transactional(Transactional.TxType.REQUIRED)
     public String getWordCount(
@@ -99,7 +99,7 @@ public class SideNoteEditStepResources {
     }
 
     @GET
-    @Path("/variants/{locale}")
+    @Path("/text/variants/{locale}")
     @Produces(MediaType.TEXT_HTML)
     @Transactional(Transactional.TxType.REQUIRED)
     public String viewTextValue(
diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
index 04db89362..a57fa9dcd 100644
--- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
+++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
@@ -375,7 +375,7 @@
                                                 </span>
                                             </button>
                                             <button class="btn btn-danger"
-                                                    data-target="##{cc.attrs.editorId}-#{entry.key}-remove-dialog"
+                                                    data-target="##{cc.attrs.editorId}-#{variant.locale}-remove-dialog"
                                                     data-toggle="modal"
                                                     type="button">
                                                 <bootstrap:svgIcon icon="x-circle" />
@@ -383,14 +383,14 @@
                                                     #{cc.attrs.removeButtonLabel}
                                                 </span>
                                             </button>
-                                            <div aria-describedby="#{cc.attrs.editorId}-#{entry.key}-remove-dialog-title"
+                                            <div aria-describedby="#{cc.attrs.editorId}-#{variant.locale}-remove-dialog-title"
                                                  aria-hidden="true"
                                                  class="modal fade"
                                                  data-backdrop="static"
-                                                 id="#{cc.attrs.editorId}-#{entry.key}-remove-dialog"
+                                                 id="#{cc.attrs.editorId}-#{variant.locale}-remove-dialog"
                                                  tabindex="-1">
                                                 <div class="modal-dialog">
-                                                    <form action="#{cc.attrs.removeMethod}/#{entry.key}"
+                                                    <form action="#{cc.attrs.removeMethod}/#{variant.locale}"
                                                           class="modal-content"
                                                           method="post">
                                                         <div class="modal-header">
@@ -425,7 +425,7 @@
                                                             <p>
                                                                 #{cc.attrs.removeDialogText}
                                                             </p>
-                                                            <pre>#{entry.key}: #{entry.value}</pre>
+                                                            <pre>#{variant.locale}</pre>
                                                             <input name="confirmed"
                                                                    type="hidden"
                                                                    value="true" />