diff --git a/aspnetcore/blazor/components/class-libraries-and-static-server-side-rendering.md b/aspnetcore/blazor/components/class-libraries-and-static-server-side-rendering.md
index 11c4455557ba..d963215e51f6 100644
--- a/aspnetcore/blazor/components/class-libraries-and-static-server-side-rendering.md
+++ b/aspnetcore/blazor/components/class-libraries-and-static-server-side-rendering.md
@@ -101,7 +101,7 @@ Consider the following example:
     <DataAnnotationsValidator />
     <ValidationSummary />
 
-    <p>Name: <InputText @bind-Value="Item.Name" /></p>
+    <p><label>Name: <InputText @bind-Value="Item.Name" /></label></p>
 
     <button type="submit">Submit</button>
 </EditForm>
diff --git a/aspnetcore/data/ef-mvc/intro/samples/cu-final/Views/Students/Index.cshtml b/aspnetcore/data/ef-mvc/intro/samples/cu-final/Views/Students/Index.cshtml
index 8dedfcc7154b..c56944a13d94 100644
--- a/aspnetcore/data/ef-mvc/intro/samples/cu-final/Views/Students/Index.cshtml
+++ b/aspnetcore/data/ef-mvc/intro/samples/cu-final/Views/Students/Index.cshtml
@@ -13,7 +13,7 @@
 <form asp-action="Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-action="Index">Back to Full List</a>
         </p>
diff --git a/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index.cshtml b/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index.cshtml
index 5f0717b353d9..0a00189f762f 100644
--- a/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index.cshtml
+++ b/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index.cshtml
@@ -13,7 +13,7 @@
 <form asp-action="Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-action="Index">Back to Full List</a>
         </p>
diff --git a/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index3.cshtml b/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index3.cshtml
index fc8f8465f812..e87c478b7608 100644
--- a/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index3.cshtml
+++ b/aspnetcore/data/ef-mvc/intro/samples/cu/Views/Students/Index3.cshtml
@@ -13,7 +13,7 @@
 <form asp-action="Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-action="Index">Back to Full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu/Pages/Students/Index.cshtml
index d96dd1e57448..cdc1fa80cc29 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form asp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" />
+            <label>Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part3-sorting/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part3-sorting/Pages/Students/Index.cshtml
index f8746ef78d44..63a5ad3b3e4e 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part3-sorting/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part3-sorting/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form sp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" />
+            <label>Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part4-migrations/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part4-migrations/Pages/Students/Index.cshtml
index a25eaf0664f1..092867c7b25e 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part4-migrations/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part4-migrations/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form sp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part5-complex/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part5-complex/Pages/Students/Index.cshtml
index a25eaf0664f1..092867c7b25e 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part5-complex/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part5-complex/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form sp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part6-related/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part6-related/Pages/Students/Index.cshtml
index a25eaf0664f1..092867c7b25e 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part6-related/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part6-related/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form sp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part7/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part7/Pages/Students/Index.cshtml
index a25eaf0664f1..092867c7b25e 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part7/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part7/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form sp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part8/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part8/Pages/Students/Index.cshtml
index a25eaf0664f1..092867c7b25e 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part8/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu20snapshots/cu-part8/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form sp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" />
+            <label>Find by name: <input type="text" name="SearchString" value="@ViewData["currentFilter"]" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu21/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu21/Pages/Students/Index.cshtml
index 4414a2410a15..0c0badc95105 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu21/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu21/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form asp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" />
+            <label>Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-3-Sorting/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-3-Sorting/Pages/Students/Index.cshtml
index 7e3fc8a13bf7..b0a66210d80c 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-3-Sorting/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-3-Sorting/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form asp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" />
+            <label>Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-4-Migrations/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-4-Migrations/Pages/Students/Index.cshtml
index 7e3fc8a13bf7..b0a66210d80c 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-4-Migrations/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-4-Migrations/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form asp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" />
+            <label>Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-5/Pages/Students/Index.cshtml b/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-5/Pages/Students/Index.cshtml
index 7e3fc8a13bf7..b0a66210d80c 100644
--- a/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-5/Pages/Students/Index.cshtml
+++ b/aspnetcore/data/ef-rp/intro/samples/cu21snapshots/Part-5/Pages/Students/Index.cshtml
@@ -14,7 +14,7 @@
 <form asp-page="./Index" method="get">
     <div class="form-actions no-color">
         <p>
-            Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" />
+            <label>Find by name: <input type="text" name="SearchString" value="@Model.CurrentFilter" /></label>
             <input type="submit" value="Search" class="btn btn-default" /> |
             <a asp-page="./Index">Back to full List</a>
         </p>
diff --git a/aspnetcore/mvc/models/model-binding.md b/aspnetcore/mvc/models/model-binding.md
index 2554dc5c531c..a2e6d7391b8b 100644
--- a/aspnetcore/mvc/models/model-binding.md
+++ b/aspnetcore/mvc/models/model-binding.md
@@ -498,9 +498,9 @@ public class PersonController
 ```cshtml
 @model Person
 
-Name: <input asp-for="Name" />
+<label>Name: <input asp-for="Name" /></label>
 <br />
-Age: <input asp-for="Age" />
+<label>Age: <input asp-for="Age" /></label>
 ```
 
 When validating record types, the runtime searches for binding and validation metadata specifically on parameters rather than on properties.
diff --git a/aspnetcore/mvc/models/model-binding/includes/model-binding7.md b/aspnetcore/mvc/models/model-binding/includes/model-binding7.md
index 350faf6d2cd5..8ab0a90ee1d9 100644
--- a/aspnetcore/mvc/models/model-binding/includes/model-binding7.md
+++ b/aspnetcore/mvc/models/model-binding/includes/model-binding7.md
@@ -484,9 +484,9 @@ public class PersonController
 ```cshtml
 @model Person
 
-Name: <input asp-for="Name" />
+<label>Name: <input asp-for="Name" /></label>
 <br />
-Age: <input asp-for="Age" />
+<label>Age: <input asp-for="Age" /></label>
 ```
 
 When validating record types, the runtime searches for binding and validation metadata specifically on parameters rather than on properties.
@@ -1117,9 +1117,9 @@ public class PersonController
 ```cshtml
 @model Person
 
-Name: <input asp-for="Name" />
+<label>Name: <input asp-for="Name" /></label>
 <br />
-Age: <input asp-for="Age" />
+<label>Age: <input asp-for="Age" /></label>
 ```
 
 When validating record types, the runtime searches for binding and validation metadata specifically on parameters rather than on properties.
@@ -1764,9 +1764,9 @@ public class PersonController
 ```cshtml
 @model Person
 
-Name: <input asp-for="Name" />
+<label>Name: <input asp-for="Name" /></label>
 ...
-Age: <input asp-for="Age" />
+<label>Age: <input asp-for="Age" /></label>
 ```
 
 When validating record types, the runtime searches for binding and validation metadata specifically on parameters rather than on properties.
diff --git a/aspnetcore/mvc/views/razor.md b/aspnetcore/mvc/views/razor.md
index 0b71be6d8221..725f4ff3f8e4 100644
--- a/aspnetcore/mvc/views/razor.md
+++ b/aspnetcore/mvc/views/razor.md
@@ -412,7 +412,7 @@ In C#, a `using` statement is used to ensure an object is disposed. In Razor, th
 @using (Html.BeginForm())
 {
     <div>
-        Email: <input type="email" id="Email" value="">
+        <label>Email: <input type="email" id="Email" value=""></label>
         <button>Register</button>
     </div>
 }
diff --git a/aspnetcore/mvc/views/working-with-forms.md b/aspnetcore/mvc/views/working-with-forms.md
index 7d35d00f7bc5..475ca9e08560 100644
--- a/aspnetcore/mvc/views/working-with-forms.md
+++ b/aspnetcore/mvc/views/working-with-forms.md
@@ -505,14 +505,14 @@ The generated HTML (when the model is valid):
 
 ```html
 <form action="/DemoReg/Register" method="post">
-  Email:  <input name="Email" id="Email" type="email" value=""
+  <label>Email: <input name="Email" id="Email" type="email" value=""
    data-val-required="The Email field is required."
    data-val-email="The Email field is not a valid email address."
-   data-val="true"><br>
+   data-val="true"></label><br>
   <span class="field-validation-valid" data-valmsg-replace="true"
    data-valmsg-for="Email"></span><br>
-  Password: <input name="Password" id="Password" type="password"
-   data-val-required="The Password field is required." data-val="true"><br>
+  <label>Password: <input name="Password" id="Password" type="password"
+   data-val-required="The Password field is required." data-val="true"></label><br>
   <span class="field-validation-valid" data-valmsg-replace="true"
    data-valmsg-for="Password"></span><br>
   <button type="submit">Register</button>
diff --git a/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterAddress.cshtml b/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterAddress.cshtml
index 1d58e1848f24..f518ebdbaf0f 100644
--- a/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterAddress.cshtml
+++ b/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterAddress.cshtml
@@ -1,8 +1,8 @@
 @model RegisterAddressViewModel
 
 <form asp-controller="Demo" asp-action="RegisterAddress" method="post">
-    Email:  <input asp-for="Email" /> <br />
-    Password: <input asp-for="Password" /><br />
-    Address: <input asp-for="Address.AddressLine1" /><br />
+    <label>Email: <input asp-for="Email" /></label> <br />
+    <label>Password: <input asp-for="Password" /></label><br />
+    <label>Address: <input asp-for="Address.AddressLine1" /></label><br />
     <button type="submit">Register</button>
 </form>
\ No newline at end of file
diff --git a/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterInput.cshtml b/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterInput.cshtml
index b054e8866c7b..487df9f5814d 100644
--- a/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterInput.cshtml
+++ b/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterInput.cshtml
@@ -1,7 +1,7 @@
 @model RegisterViewModel
 
 <form asp-controller="Demo" asp-action="RegisterInput" method="post">
-    Email:  <input asp-for="Email" /> <br />
-    Password: <input asp-for="Password" /><br />
+    <label>Email: <input asp-for="Email" /></label> <br />
+    <label>Password: <input asp-for="Password" /></label><br />
     <button type="submit">Register</button>
 </form>
\ No newline at end of file
diff --git a/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterValidation.cshtml b/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterValidation.cshtml
index 9a448244f155..f18413f78b16 100644
--- a/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterValidation.cshtml
+++ b/aspnetcore/mvc/views/working-with-forms/sample/final/Views/Demo/RegisterValidation.cshtml
@@ -2,9 +2,9 @@
 
 <form asp-controller="Demo" asp-action="RegisterValidation" method="post">
     <div asp-validation-summary="ModelOnly"></div>
-    Email:  <input asp-for="Email" /> <br />
+    <label>Email: <input asp-for="Email" /></label> <br />
     <span asp-validation-for="Email"></span><br />
-    Password: <input asp-for="Password" /><br />
+    <label>Password: <input asp-for="Password" /></label><br />
     <span asp-validation-for="Password"></span><br />
     <button type="submit">Register</button>
 </form>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts/Pages/Create.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts/Pages/Create.cshtml
index 3c7be1902f54..bde95764dee3 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts/Pages/Create.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts/Pages/Create.cshtml
@@ -9,7 +9,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" />
     </form>
 </body>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create.cshtml
index abe87d9cfa65..09034bd696db 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" />
     </form>
 </body>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create2Dot.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create2Dot.cshtml
index 37684075e933..052b0ab6b41c 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create2Dot.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/Create2Dot.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" />
     </form>
 </body>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateBlank.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateBlank.cshtml
index f05705a0aec2..d9c30b5b8787 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateBlank.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateBlank.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" />
     </form>
 </body>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateDot.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateDot.cshtml
index 126088995d56..e61bfc254c8c 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateDot.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateDot.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" />
     </form>
 </body>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateFATH.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateFATH.cshtml
index b7c946ed208a..bd898411e4ca 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateFATH.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateFATH.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <!-- <snippet_Handlers> -->
         <input type="submit" asp-page-handler="JoinList" value="Join" />
         <input type="submit" asp-page-handler="JoinListUC" value="JOIN UC" />
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateRoute.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateRoute.cshtml
index 1c24d0d2da61..2cf61d3544a6 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateRoute.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateRoute.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" asp-page-handler="JoinList" value="Join" />
         <input type="submit" asp-page-handler="JoinListUC" value="JOIN UC" />
     </form>
diff --git a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateTempData.cshtml b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateTempData.cshtml
index a29a82619889..82d6819c69e5 100644
--- a/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateTempData.cshtml
+++ b/aspnetcore/razor-pages/index/sample/RazorPagesContacts2/Pages/Customers/CreateTempData.cshtml
@@ -8,7 +8,7 @@
     </p>
     <div asp-validation-summary="All"></div>
     <form method="POST">
-        <div>Name: <input asp-for="Customer.Name" /></div>
+        <div><label>Name: <input asp-for="Customer.Name" /></label></div>
         <input type="submit" />
     </form>
 </body>
diff --git a/aspnetcore/release-notes/aspnetcore-5.0.md b/aspnetcore/release-notes/aspnetcore-5.0.md
index 97c896ca66e0..5220330a71f8 100644
--- a/aspnetcore/release-notes/aspnetcore-5.0.md
+++ b/aspnetcore/release-notes/aspnetcore-5.0.md
@@ -43,10 +43,10 @@ The `Person/Index.cshtml` file:
 ```cshtml
 @model Person
 
-Name: <input asp-for="Model.Name" />
+<label>Name: <input asp-for="Model.Name" /></label>
 <span asp-validation-for="Model.Name" />
 
-Age: <input asp-for="Model.Age" />
+<label>Age: <input asp-for="Model.Age" /></label>
 <span asp-validation-for="Model.Age" />
 ```
 
diff --git a/aspnetcore/security/anti-request-forgery/samples/2.x/MvcSample/Views/Home/Index.cshtml b/aspnetcore/security/anti-request-forgery/samples/2.x/MvcSample/Views/Home/Index.cshtml
index 8ef9d92d3604..a204f8d0d0c6 100644
--- a/aspnetcore/security/anti-request-forgery/samples/2.x/MvcSample/Views/Home/Index.cshtml
+++ b/aspnetcore/security/anti-request-forgery/samples/2.x/MvcSample/Views/Home/Index.cshtml
@@ -11,7 +11,7 @@
         <h2>Form 1</h2>
         <form asp-action="SamplePost" method="post">
             <div>
-                Message: <input type="text" name="message" />
+                <label>Message: <input type="text" name="message" /></label>
                 <input type="submit" value="Send" />
             </div>
         </form>
@@ -21,7 +21,7 @@
         @using (Html.BeginForm("SamplePost", "Home"))
         {
             <div>
-                Message: <input type="text" name="message" />
+                <label>Message: <input type="text" name="message" /></label>
                 <input type="submit" value="Send" />
             </div>
         }
@@ -31,7 +31,7 @@
         <form action="/home/samplepost" method="post">
             @Html.AntiForgeryToken()
             <div>
-                Message: <input type="text" name="message" />
+                <label>Message: <input type="text" name="message" /></label>
                 <input type="submit" value="Send" />
             </div>
         </form>
diff --git a/aspnetcore/tutorials/first-mvc-app-xplat/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app-xplat/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml
index da96849c6d8b..5f0a4eddddcd 100644
--- a/aspnetcore/tutorials/first-mvc-app-xplat/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app-xplat/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString">
+        <label>Title: <input type="text" name="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/2.2-completed/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/2.2-completed/Views/Movies/Index.cshtml
index 18ad69387d33..2e3495b12a07 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/2.2-completed/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/2.2-completed/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input asp-for="SearchString">
+        <label>Title: <input asp-for="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/6.0-completed/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/6.0-completed/Views/Movies/Index.cshtml
index 4f36095b55fd..a9c39b8b2427 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/6.0-completed/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/6.0-completed/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/7.0-completed/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/7.0-completed/Views/Movies/Index.cshtml
index bb0b865745e7..4117bca842e0 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/7.0-completed/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/7.0-completed/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/8.0-completed/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/8.0-completed/Views/Movies/Index.cshtml
index 99a39d802ce6..0d57275e7e68 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/8.0-completed/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/8.0-completed/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/9.0-completed/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/9.0-completed/Views/Movies/Index.cshtml
index 79b77c79d792..44b1d1176bef 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/9.0-completed/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/9.0-completed/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml
index 766488405893..f5af5b13c2db 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexForm1.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexForm1.cshtml
index 0bb7e3e8a00d..21f0388fda32 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexForm1.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexForm1.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenre.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenre.cshtml
index 766488405893..f5af5b13c2db 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenre.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenre.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenreNoRating.cshtml
index cd70417f350e..4941e1ba76fd 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input asp-for="SearchString">
+        <label>Title: <input asp-for="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexGenreRating.cshtml
index 766488405893..f5af5b13c2db 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Views/Movies/IndexGenreRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie21/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie21/Views/Movies/Index.cshtml
index 93875d323ac2..c6280c52065b 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie21/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie21/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString">
+        <label>Title: <input type="text" name="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/Index.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/Index.cshtml
index f3ea62eac5cd..ce350e86c3cf 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/Index.cshtml
@@ -15,7 +15,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexFormGenreNoRating.cshtml
index 55cc413f62cc..e9b85adfdbc3 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGenreRating.cshtml
index f3ea62eac5cd..ce350e86c3cf 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGenreRating.cshtml
@@ -15,7 +15,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGet.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGet.cshtml
index e2cc9e256253..d74a2e21360f 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGet.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie22/Views/Movies/IndexGet.cshtml
@@ -11,7 +11,7 @@
 </p>
 <form asp-controller="Movies" asp-action="Index" method="get">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie3/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie3/Views/Movies/IndexGenreRating.cshtml
index cfbed84942cc..b240a29b8f43 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie3/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie3/Views/Movies/IndexGenreRating.cshtml
@@ -15,7 +15,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie5/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie5/Views/Movies/IndexGenreRating.cshtml
index cfbed84942cc..b240a29b8f43 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie5/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie5/Views/Movies/IndexGenreRating.cshtml
@@ -15,7 +15,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexForm1.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexForm1.cshtml
index 73e8d6eb44d2..f87d602279a2 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexForm1.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexForm1.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexFormGenreNoRating.cshtml
index 32906fd071fe..d9e7f74e6881 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGenreRating.cshtml
index 340040e87ffd..ccdac3fd337b 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGenreRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGet.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGet.cshtml
index 93ad6be2b183..f96391c2bd21 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGet.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie60/Views/Movies/IndexGet.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index" method="get">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexForm1.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexForm1.cshtml
index 73e8d6eb44d2..f87d602279a2 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexForm1.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexForm1.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexFormGenreNoRating.cshtml
index 360c26b87cd4..3d6a11ef148b 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGenreRating.cshtml
index 79b77c79d792..44b1d1176bef 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGenreRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGet.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGet.cshtml
index 93ad6be2b183..f96391c2bd21 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGet.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie70/Views/Movies/IndexGet.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index" method="get">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexForm1.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexForm1.cshtml
index 73e8d6eb44d2..f87d602279a2 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexForm1.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexForm1.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexFormGenreNoRating.cshtml
index 360c26b87cd4..3d6a11ef148b 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGenreRating.cshtml
index 79b77c79d792..44b1d1176bef 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGenreRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGet.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGet.cshtml
index 93ad6be2b183..f96391c2bd21 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGet.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie80/Views/Movies/IndexGet.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index" method="get">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexForm1.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexForm1.cshtml
index 73e8d6eb44d2..f87d602279a2 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexForm1.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexForm1.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexFormGenreNoRating.cshtml
index 360c26b87cd4..3d6a11ef148b 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGenreRating.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGenreRating.cshtml
index 79b77c79d792..44b1d1176bef 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGenreRating.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGenreRating.cshtml
@@ -16,7 +16,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGet.cshtml b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGet.cshtml
index 93ad6be2b183..f96391c2bd21 100644
--- a/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGet.cshtml
+++ b/aspnetcore/tutorials/first-mvc-app/start-mvc/sample/MvcMovie90/Views/Movies/IndexGet.cshtml
@@ -12,7 +12,7 @@
 
 <form asp-controller="Movies" asp-action="Index" method="get">
     <p>
-        Title: <input type="text" name="SearchString" />
+        <label>Title: <input type="text" name="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieNewField/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieNewField/Pages/Movies/Index.cshtml
index 42bf794cdcb1..0e27714ea4e4 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieNewField/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieNewField/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieSQLiteNewField/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieSQLiteNewField/Pages/Movies/Index.cshtml
index 42bf794cdcb1..0e27714ea4e4 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieSQLiteNewField/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/2.2-stage-samples/RPmovieSQLiteNewField/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index.cshtml
index a931ea2deaa3..4d2545a8f4fc 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index.cshtml
@@ -17,7 +17,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input asp-for="SearchString">
+        <label>Title: <input asp-for="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index2.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index2.cshtml
index ba881248f8a6..009ed2dac86a 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index2.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/Index2.cshtml
@@ -13,7 +13,7 @@
 
 <form>
     <p>
-        Title: <input type="text" name="SearchString">
+        <label>Title: <input type="text" name="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/IndexFormGenreNoRating.cshtml
index 7aca63e9d847..b456b3c4ea0d 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie/Pages/Movies/IndexFormGenreNoRating.cshtml
@@ -17,7 +17,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString">
+        <label>Title: <input type="text" name="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie21/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie21/Pages/Movies/Index.cshtml
index f29efb049147..248d58fde696 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie21/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie21/Pages/Movies/Index.cshtml
@@ -17,7 +17,7 @@
             <option value="">All</option>
         </select>
 
-        Title: <input type="text" name="SearchString">
+        <label>Title: <input type="text" name="SearchString"></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index.cshtml
index d8948d0b343c..231bc70f61d2 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index2.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index2.cshtml
index a97b13e1bf6f..1b3aa8eccdb1 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index2.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/Index2.cshtml
@@ -13,7 +13,7 @@
 
 <form>
     <p>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexFormGenreNoRating.cshtml
index 10fbad1e8181..c2372371b52c 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexRating.cshtml
index 514d9723dd77..33138982033e 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie22/Pages/Movies/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/Pages/Movies/Index.cshtml
index 79369ba53c4f..fd7952cd8f89 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/Index2.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/Index2.cshtml
index a97b13e1bf6f..1b3aa8eccdb1 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/Index2.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/Index2.cshtml
@@ -13,7 +13,7 @@
 
 <form>
     <p>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexFormGenreNoRating.cshtml
index 10fbad1e8181..c2372371b52c 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexRating.cshtml
index 79369ba53c4f..fd7952cd8f89 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie30/SnapShots/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/Pages/Movies/Index.cshtml
index 79369ba53c4f..fd7952cd8f89 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/Index2.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/Index2.cshtml
index a97b13e1bf6f..1b3aa8eccdb1 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/Index2.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/Index2.cshtml
@@ -13,7 +13,7 @@
 
 <form>
     <p>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexFormGenreNoRating.cshtml
index 10fbad1e8181..c2372371b52c 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexRating.cshtml
index 79369ba53c4f..fd7952cd8f89 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie50/SnapShots/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/IndexRating.cshtml
index 1a76f356841e..b92ee832a88a 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/Pages/Movies/Index.cshtml
index 3da3fd12553b..d87e9e8eda97 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie60/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie70/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie70/Pages/Movies/Index.cshtml
index 5c0ebbca8107..4a8b33200c2b 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie70/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie70/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie80/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie80/Pages/Movies/Index.cshtml
index 5c0ebbca8107..4a8b33200c2b 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie80/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie80/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie90/Pages/Movies/Index.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie90/Pages/Movies/Index.cshtml
index 0ade1244ca51..f19076251f7a 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie90/Pages/Movies/Index.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/sample/RazorPagesMovie90/Pages/Movies/Index.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/Index2.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/Index2.cshtml
index f78b355ea377..207aebf457c8 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/Index2.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/Index2.cshtml
@@ -13,7 +13,7 @@
 
 <form>
     <p>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexFormGenreNoRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexFormGenreNoRating.cshtml
index 1a76f356841e..b92ee832a88a 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexFormGenreNoRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexFormGenreNoRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexRating.cshtml
index 79369ba53c4f..fd7952cd8f89 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample6/Pages/Movies/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample7/Pages/Movies/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample7/Pages/Movies/IndexRating.cshtml
index 37f0f2897601..ea64c1b32dd1 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample7/Pages/Movies/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample7/Pages/Movies/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample8/Pages/Movies/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample8/Pages/Movies/IndexRating.cshtml
index 37f0f2897601..ea64c1b32dd1 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample8/Pages/Movies/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample8/Pages/Movies/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/IndexRating.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/IndexRating.cshtml
index 37f0f2897601..ea64c1b32dd1 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/IndexRating.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/IndexRating.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedGenre.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedGenre.cshtml
index 85b5a609f7c6..ffd67253fab5 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedGenre.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedGenre.cshtml
@@ -16,7 +16,7 @@
         <select asp-for="MovieGenre" asp-items="Model.Genres">
             <option value="">All</option>
         </select>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>
diff --git a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedTitle.cshtml b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedTitle.cshtml
index 922e0fdbcd02..8689c11ef76d 100644
--- a/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedTitle.cshtml
+++ b/aspnetcore/tutorials/razor-pages/razor-pages-start/snapshot_sample9/Pages/Movies/Index_SearchAddedTitle.cshtml
@@ -13,7 +13,7 @@
 
 <form>
     <p>
-        Title: <input type="text" asp-for="SearchString" />
+        <label>Title: <input type="text" asp-for="SearchString" /></label>
         <input type="submit" value="Filter" />
     </p>
 </form>