diff --git a/Dfe.Academies.External.Web/Pages/School/ApplicationSelectSchool.cshtml b/Dfe.Academies.External.Web/Pages/School/ApplicationSelectSchool.cshtml
index 6687b1cae..2e18fda0e 100644
--- a/Dfe.Academies.External.Web/Pages/School/ApplicationSelectSchool.cshtml
+++ b/Dfe.Academies.External.Web/Pages/School/ApplicationSelectSchool.cshtml
@@ -24,27 +24,25 @@
 
 				<h2 class="govuk-caption-l">School details</h2>
 				<fieldset class="govuk-fieldset" data-required data-error="Search cannot be blank" aria-required="true">
-					<div id="SearchQueryContainer" class="govuk-form-group">
-						<legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-							<h2 class="govuk-fieldset__heading govuk-heading-m">
-								What is the name of the school?
-							</h2>
-						</legend>
-						<label class="govuk-hint"
-						       for="schoolSelect">
-							Enter the name of the school, or its 6 digit unique reference number (URN)
-						</label>
-						<span asp-validation-for="SearchQuery" class="govuk-error-message"></span>
-						<input id='SearchQueryInput' asp-for="@Model.SearchQuery"
-						       class="govuk-input govuk-input--width-20"
-						       maxlength="100"
-						       type="search" aria-valuetext=""
-						       aria-describedby="search-hint search-error"/>
-						<div id="autocomplete-container" data-cy="schoolSearchBox"></div>
-						@*						<ul class="autocomplete__menu autocomplete__menu--inline autocomplete__menu--hidden" id="search__listbox" role="listbox">
-							<li class="autocomplete__option autocomplete__option--no-results">No results found.</li>
-						</ul>*@
-					</div>
+                    <div id="SearchQueryContainer" class="govuk-form-group">
+                        <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+                            <h2 class="govuk-fieldset__heading govuk-heading-m">
+                                What is the name of the school?
+                            </h2>
+                        </legend>
+                        <label class="govuk-hint" id="search-hint" for="SearchQueryInput">
+                            Enter the name of the school, or its 6 digit unique reference number (URN)
+                        </label>
+                        <span asp-validation-for="SearchQuery" class="govuk-error-message" id="search-error"></span>
+                        <input id="SearchQueryInput"
+                               asp-for="@Model.SearchQuery"
+                               class="govuk-input govuk-input--width-20"
+                               maxlength="100"
+                               type="search"
+                               aria-describedby="search-hint search-error" />
+                        <div id="autocomplete-container" data-cy="schoolSearchBox"></div>
+                    </div>
+
 
 					<div class="govuk-form-group">
 						<div id="schoolSelectedDetails" class="hideElement"></div>
diff --git a/Dfe.Academies.External.Web/Pages/Trust/JoinAMat/ApplicationSelectTrust.cshtml b/Dfe.Academies.External.Web/Pages/Trust/JoinAMat/ApplicationSelectTrust.cshtml
index 9b77864a3..69a390526 100644
--- a/Dfe.Academies.External.Web/Pages/Trust/JoinAMat/ApplicationSelectTrust.cshtml
+++ b/Dfe.Academies.External.Web/Pages/Trust/JoinAMat/ApplicationSelectTrust.cshtml
@@ -31,11 +31,11 @@
 								Which trust is the school joining?
 							</h2>
 						</legend>
-						<label class="govuk-hint"
-						       for="schoolSelect">
+                        <label class="govuk-hint" id="search-hint"
+                               for="SearchQueryInput">
 							Enter the name of the trust, its Companies House number, or its group Id
 						</label>
-						<span asp-validation-for="SearchQuery" class="govuk-error-message"></span>
+                        <span asp-validation-for="SearchQuery" class="govuk-error-message" id="search-error"></span>
 						<input id='SearchQueryInput' asp-for="@Model.SearchQuery"
 						       class="govuk-input govuk-input--width-20"
 						       maxlength="100"