diff --git a/searchform.php b/searchform.php
index 69719085..c4504633 100644
--- a/searchform.php
+++ b/searchform.php
@@ -16,13 +16,13 @@ if ( isset( $args['aria_label'] ) && ! empty( $args['aria_label'] ) ) {
 }
 ?>
 
-<form method="get" class="search-form" id="<?php echo 'search-form' . $uid; ?>" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search" <?php echo $aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?>>
+<form role="search" class="search-form" id="<?php echo 'search-form' . $uid; ?>" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>" <?php echo $aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?>>
 	<label class="sr-only" for="<?php echo 's' . $uid; ?>"><?php esc_html_e( 'Search', 'understrap' ); ?></label>
 	<div class="input-group">
-		<input class="field form-control" id="<?php echo 's' . $uid; ?>" name="s" type="text"
-			placeholder="<?php esc_attr_e( 'Search &hellip;', 'understrap' ); ?>" value="<?php the_search_query(); ?>">
+		<input type="text" class="field form-control" id="<?php echo 's' . $uid; ?>" name="s" value="<?php the_search_query(); ?>"
+			placeholder="<?php esc_attr_e( 'Search &hellip;', 'understrap' ); ?>">
 		<span class="input-group-append">
-			<input class="submit btn btn-primary" id="<?php echo 'search-submit' . $uid; ?>" name="submit" type="submit"
+			<input type="submit" class="submit btn btn-primary" id="<?php echo 'search-submit' . $uid; ?>" name="submit"
 			value="<?php esc_attr_e( 'Search', 'understrap' ); ?>">
 		</span>
 	</div>