diff --git a/src/assets/scripts/Pinecone/NestedCheckbox/index.js b/src/assets/scripts/Pinecone/NestedCheckbox/index.js
index 563faf0e..84da196e 100644
--- a/src/assets/scripts/Pinecone/NestedCheckbox/index.js
+++ b/src/assets/scripts/Pinecone/NestedCheckbox/index.js
@@ -51,8 +51,8 @@ class NestedCheckbox {
 		supplementaryLabel.classList.add( 'screen-reader-text' );
 		supplementaryLabel.hidden = false;
 		this.input.parentNode.insertBefore( customCheckbox, this.input );
-		this.input.setAttribute( 'type', 'hidden' );
-		this.input.setAttribute( 'value', status ? this.value : '' );
+		this.input.classList.add( 'screen-reader-text' );
+		this.input.setAttribute( 'aria-hidden', 'true' );
 		this.label.hidden = true;
 		this.customCheckbox = customCheckbox;
 	}
@@ -72,7 +72,7 @@ class NestedCheckbox {
 	toggleMixedCheckbox( ctrl ) {
 		const state = 'true' === ctrl.getAttribute( 'aria-checked' ) || false;
 		ctrl.setAttribute( 'aria-checked', !state );
-		this.input.setAttribute( 'value', !state ? this.value : '' );
+		this.input.checked = !state;
 		Array.prototype.forEach.call( this.subInputs, checkbox => {
 			checkbox.checked = !state;
 		} );
diff --git a/src/components/atoms/button/button.njk b/src/components/atoms/button/button.njk
index e0b163c7..89daf7cd 100644
--- a/src/components/atoms/button/button.njk
+++ b/src/components/atoms/button/button.njk
@@ -1,4 +1,4 @@
 {% if not standAlone %}<div class="spacer"></div>{% endif %}
-<button {% if id %}id="{{ id }}" {% endif %}type="button" class="button{% if modifiers %}{% for modifier in modifiers %} button--{{ modifier }}{% endfor %}{% endif %}{% if className %} {{ className }}{% endif %}">
+<button {% if id %}id="{{ id }}" {% endif %}type="{{ type }}" class="button{% if modifiers %}{% for modifier in modifiers %} button--{{ modifier }}{% endfor %}{% endif %}{% if className %} {{ className }}{% endif %}">
 	{% if icon and iconPosition === 'start' %}{% render '@svg', {svg:icon}, true %}{% endif %}<span class="button__label{{ ' screen-reader-text' if labelVisuallyHidden }}">{{ label | safe }}</span>{% if icon and iconPosition === 'end' %}{% render '@svg', {svg:icon}, true %}{% endif %}
 </button>
diff --git a/src/components/layouts/archive/archive.njk b/src/components/layouts/archive/archive.njk
index 0c5fa8dc..d148c287 100644
--- a/src/components/layouts/archive/archive.njk
+++ b/src/components/layouts/archive/archive.njk
@@ -12,7 +12,7 @@
 			{% render '@filter-list', {standAlone: true, label: filterList.label, terms: filterList.terms}, true %}
 		{% endfor %}
 		</div>
-		{% render '@submit', {standAlone: true, value: 'Apply filters', id: 'apply-filters'} %}
+		{% render '@submit', {standAlone: true, label: 'Apply filters', id: 'apply-filters'}, true %}
 	</form>
 </div>
 <div class="sort-wrapper">
diff --git a/src/components/layouts/search-results/search-results.njk b/src/components/layouts/search-results/search-results.njk
index 0abe88a8..63c0522d 100644
--- a/src/components/layouts/search-results/search-results.njk
+++ b/src/components/layouts/search-results/search-results.njk
@@ -12,7 +12,7 @@
 			{% render '@filter-list', {standAlone: true, label: filterList.label, terms: filterList.terms}, true %}
 		{% endfor %}
 		</div>
-		{% render '@submit', {standAlone: true, value: 'Apply filters', id: 'apply-filters'} %}
+		{% render '@submit', {standAlone: true, label: 'Apply filters', id: 'apply-filters'}, true %}
 	</form>
 </div>
 <div class="sort-wrapper">