diff --git a/src/view/frontend/web/template/shipping-address/shipping-method-item.html b/src/view/frontend/web/template/shipping-address/shipping-method-item.html
index 275cc9f..c5e400f 100644
--- a/src/view/frontend/web/template/shipping-address/shipping-method-item.html
+++ b/src/view/frontend/web/template/shipping-address/shipping-method-item.html
@@ -10,17 +10,17 @@
                ko-checked="element.isSelected"
                ko-value="method.carrier_code + '_' + method.method_code"
                attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
-                    'checked': element.rates().length == 1 || element.isSelected" />
+                    'checked': element.rates().length == 1 || element.isSelected">
     </td>
     <td class="col col-price">
-        <each args="element.getRegion('price')" render="" />
+        <each args="element.getRegion('price')" render=""></each>
     </td>
     <td class="col col-method"
         attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
-        text="method.method_title" />
+        text="method.method_title"></td>
     <td class="col col-carrier"
         attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
-        text="method.carrier_title" />
+        text="method.carrier_title"></td>
 </tr>
 <tr class="row row-error"
     if="method.error_message">
@@ -30,7 +30,7 @@
         </div>
         <span class="no-display">
             <input type="radio"
-                   attr="'value' : method.method_code, 'id': 's_method_' + method.method_code" />
+                   attr="'value' : method.method_code, 'id': 's_method_' + method.method_code">
         </span>
     </td>
 </tr>
diff --git a/src/view/frontend/web/template/shipping.html b/src/view/frontend/web/template/shipping.html
index 5ae96fc..7afd503 100644
--- a/src/view/frontend/web/template/shipping.html
+++ b/src/view/frontend/web/template/shipping.html
@@ -1,12 +1,12 @@
 <li id="shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
-    <div class="step-title" translate="'Shipping Address'" data-role="title" />
+    <div class="step-title" translate="'Shipping Address'" data-role="title"></div>
     <div id="checkout-step-shipping"
          class="step-content"
          data-role="content">
 
-        <each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" />
-        <each args="getRegion('address-list')" render="" />
-        <each args="getRegion('address-list-additional-addresses')" render="" />
+        <each if="!quoteIsVirtual" args="getRegion('customer-email')" render=""></each>
+        <each args="getRegion('address-list')" render=""></each>
+        <each args="getRegion('address-list-additional-addresses')" render=""></each>
 
         <!-- Address form pop up -->
         <if args="!isFormInline">
@@ -14,19 +14,19 @@
                     class="action action-show-popup"
                     click="showFormPopUp"
                     visible="!isNewAddressAdded()">
-                <span translate="'New Address'" />
+                <span translate="'New Address'"></span>
             </button>
             <div id="opc-new-shipping-address"
                  visible="isFormPopUpVisible()"
-                 render="shippingFormTemplate" />
+                 render="shippingFormTemplate"></div>
         </if>
 
-        <each args="getRegion('before-form')" render="" />
+        <each args="getRegion('before-form')" render=""></each>
 
         <!-- Inline address form -->
-        <render if="isFormInline" args="shippingFormTemplate" />
+        <render if="isFormInline" args="shippingFormTemplate"></render>
     </div>
-    <br class="clearfix" />
+    <br class="clearfix">
 </li>
 
 <li id="opc-shipping_method"
@@ -38,10 +38,10 @@
         <!-- ko ifnot: shouldHideShipping() -->
         <div class="step-title"
              translate="'Shipping Methods'"
-             data-role="title" />
+             data-role="title"></div>
         <!-- /ko -->
 
-        <each args="getRegion('before-shipping-method-form')" render="" />
+        <each args="getRegion('before-shipping-method-form')" render=""></each>
 
         <div id="checkout-step-shipping_method"
              class="step-content"
@@ -55,28 +55,28 @@
                   novalidate="novalidate">
 
                 <!-- ko ifnot: shouldHideShipping() -->
-                <render args="shippingMethodListTemplate"/>
+                <render args="shippingMethodListTemplate"></render>
                 <!-- /ko -->
 
                 <div id="onepage-checkout-shipping-method-additional-load">
-                    <each args="getRegion('shippingAdditional')" render="" />
+                    <each args="getRegion('shippingAdditional')" render=""></each>
                 </div>
                 <div role="alert"
                      if="errorValidationMessage().length"
                      class="message notice">
-                    <span text="errorValidationMessage()" />
+                    <span text="errorValidationMessage()"></span>
                 </div>
                 <div class="actions-toolbar" id="shipping-method-buttons-container">
                     <div class="primary">
                         <button data-role="opc-continue" type="submit" class="button action continue primary">
-                            <span translate="'Next'" />
+                            <span translate="'Next'"></span>
                         </button>
                     </div>
                 </div>
             </form>
             <div class="no-quotes-block"
                  ifnot="rates().length > 0"
-                 translate="'Sorry, no quotes are available for this order at this time'" />
+                 translate="'Sorry, no quotes are available for this order at this time'"></div>
         </div>
     </div>
 </li>