diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml
index f1c4ff217da2..6f40add137fe 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml
@@ -89,7 +89,12 @@
       </dl>
     #else
       <dl>
-        <dt><label #if($isEditing)for="TourCode.StepClass_0_${prop.name}"#end>$services.localization.render("${class.name}_${prop.name}")</label></dt>
+    <dt><label #if($isEditing)for="TourCode.StepClass_0_${prop.name}"#end>$services.localization.render("${class.name}_${prop.name}")</label>
+    ## Add a hint for the field if there's one defined in the translations.
+    #if($!services.localization.render("${class.name}_${prop.name}.hint") != "${class.name}_${prop.name}.hint")##
+    <span class='xHint'>$!services.localization.render("${class.name}_${prop.name}.hint")</span>##
+    #end##
+    </dt>
         <dd>$vobj.get($prop.getName())</dd>
       </dl>
     #end
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml
index c4b4c9961d8f..246e198ab5fd 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml
@@ -428,7 +428,10 @@ require(['jquery', 'xwiki-meta'], function ($, xm) {
           createTour(tour);
         }
       }
+    }).fail(function (data) {
+      console.error("Querying the JSON for the Tour failed. %o", data);
     });
+    ;
   });
 });</code>
     </property>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJson.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJson.xml
index 80b0fdeb6199..6f1c3f09559a 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJson.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJson.xml
@@ -38,7 +38,7 @@
   <hidden>true</hidden>
   <content>{{include reference="TourCode.Macros"/}}
 
-{{velocity}}
+    {{velocity wiki="false"}}
 #if ($xcontext.action == 'get')
   ##--------------------------------------------------------
   ## Get the tour steps corresponding to the target page
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.xml
index 714656a87192..815716049be0 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourTranslations.xml
@@ -69,6 +69,7 @@ tour.popover.show.hint=You can restart the tour by clicking this button at anyti
 # Steps
 TourCode.StepClass_order=Order
 TourCode.StepClass_element=Element (CSS selector that identify an element)
+TourCode.StepClass_element.hint=CSS selector that identifies an element. Escape special CSS characters with a backslash.
 TourCode.StepClass_title=Title
 TourCode.StepClass_content=Content
 TourCode.StepClass_backdrop=Backdrop