diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml
index 566a9c3ac0..0e43eb9e07 100644
--- a/app/views/admin/order_cycles/checkout_options.html.haml
+++ b/app/views/admin/order_cycles/checkout_options.html.haml
@@ -78,7 +78,7 @@
                   %p
                     = t('.no_payment_methods')
 
-  %div#save-bar
+  #save-bar
     .container
       .seven.columns.alpha
         - if @order_cycle.errors.any?
diff --git a/app/views/checkout/_voucher_section.html.haml b/app/views/checkout/_voucher_section.html.haml
index ab75648579..9a4a816f03 100644
--- a/app/views/checkout/_voucher_section.html.haml
+++ b/app/views/checkout/_voucher_section.html.haml
@@ -1,4 +1,4 @@
-%div#voucher-section
+#voucher-section
   .checkout-title
     = t("checkout.step2.voucher.apply_voucher")
   .checkout-input{"data-controller": "toggle-control"}
diff --git a/app/views/registration/_modal.html.haml b/app/views/registration/_modal.html.haml
index 798c1f23f9..8e939aa5ad 100644
--- a/app/views/registration/_modal.html.haml
+++ b/app/views/registration/_modal.html.haml
@@ -1,5 +1,5 @@
 %script{ type: "text/ng-template", id: "registration.html" }
-  %div#registration-modal{"ng-controller" => "RegistrationCtrl"}
+  #registration-modal{"ng-controller" => "RegistrationCtrl"}
     %div{ "ng-show": "currentStep() == 'introduction'" }
       %ng-include{ src: "'registration/introduction.html'" }
     %div{ "ng-repeat": 'step in steps', "ng-show": "currentStep() == step" }
diff --git a/app/views/shared/_map.html.haml b/app/views/shared/_map.html.haml
index f1b31ace3d..c388ee5e12 100644
--- a/app/views/shared/_map.html.haml
+++ b/app/views/shared/_map.html.haml
@@ -1,7 +1,7 @@
 - if ContentConfig.open_street_map_enabled
   .map-container
     %ofn-open-street-map#open-street-map
-    %div#open-street-map--search
+    #open-street-map--search
       %input.autocomplete-input
       %ul.autocomplete-result-list