diff --git a/src/Resources/views/storefront/components/factfinder/paging.html.twig b/src/Resources/views/storefront/components/factfinder/paging.html.twig
index 50ea4df0..88db4cef 100644
--- a/src/Resources/views/storefront/components/factfinder/paging.html.twig
+++ b/src/Resources/views/storefront/components/factfinder/paging.html.twig
@@ -1,5 +1,5 @@
 {% block component_factfinder_paging %}
-  <ff-paging class="pagination" unresolved {% if showOnly %} show-only="{{ showOnly }}" {% endif %}>
+  <ff-paging class="pagination" unresolved {% if showOnly %} show-only {% endif %}>
     <ff-paging-item type="firstLink" class="page-item page-first">
       <div class="page-link">
         {% sw_icon 'arrow-medium-double-left' style { size: 'fluid', pack: 'solid'} %}
@@ -14,7 +14,7 @@
 
     {% for p in -1..1 %}
       <ff-paging-item type="currentLink{% if p %} {{ p }}{% endif %}" class="page-item{% if not p %} active{% endif %}">
-        <div class="page-link">{{ '{{caption}}' }}</div>
+        <div class="page-link">{{ '{{page}}' }}</div>
       </ff-paging-item>
     {% endfor %}
 
diff --git a/src/Resources/views/storefront/element/cms-element-sortbox.html.twig b/src/Resources/views/storefront/element/cms-element-sortbox.html.twig
index dc2e4209..53a1d4e1 100644
--- a/src/Resources/views/storefront/element/cms-element-sortbox.html.twig
+++ b/src/Resources/views/storefront/element/cms-element-sortbox.html.twig
@@ -3,8 +3,8 @@
       <ff-sortbox-select class="sorting" unresolved
                          subscribe="{{ config.subscribe.value ? 'true' : 'false' }}"
         {{ config.opened.value ? 'opened' : '' }}
-        {{ config.showSelected.value ? 'show-selected="true"' : '' }}
-        {{ config.showSelected.value ? 'show-selected-first="config.showSelectedFirst.value"' }}>
+        {{ config.showSelected.value ? 'show-selected=true' : '' }}
+        {{ config.showSelected.value ? 'show-selected-first=config.showSelectedFirst.value' }}>
         <select class="sorting custom-select" aria-label="{{ 'general.sortingLabel'|trans|striptags }}"></select>
       </ff-sortbox-select>
     {% endblock %}