diff --git a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9521bc70162712caf118d.md b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9521bc70162712caf118d.md
index cd7eb69ff6c..9557b9aa03a 100644
--- a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9521bc70162712caf118d.md
+++ b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9521bc70162712caf118d.md
@@ -20,46 +20,46 @@ Here is an example of two radio buttons:
In this example, the radio buttons are grouped together by using the same `name` attribute value. This means that only one radio button can be selected at a time.
-Below your `legend` element, add a `label` element with the text `Yes` and a `for` attribute set to `"yes-option"`.
+Below your `legend` element, add a `radio` button with the `id` set to `"yes-option"`, and the `name` attribute set to `"hotel-stay"`.
-Below your `label` element, add a `radio` button with the `id` set to `"yes-option"`, and the `name` attribute set to `"hotel-stay"`.
+Below your `radio` button, add a `label` element with the text `Yes` and a `for` attribute set to `"yes-option"`.
# --hints--
-You should have a `label` element below your `legend` element.
+You should have a `radio` button below your `legend` element.
```js
-assert.exists(document.querySelector('fieldset:nth-of-type(2) legend + label'));
-```
-
-Your `label` element should have a `for` attribute set to `"yes-option"`.
-
-```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) legend + label')?.htmlFor, 'yes-option');
-```
-
-Your `label` element should have the text `Yes`.
-
-```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) legend + label')?.innerText, 'Yes');
-```
-
-You should have a `radio` button below your `label` element.
-
-```js
-assert.exists(document.querySelector('fieldset:nth-of-type(2) label + input[type="radio"]'));
+assert.exists(document.querySelector('fieldset:nth-of-type(2) legend + input[type="radio"]'));
```
Your `radio` button should have an `id` attribute set to `"yes-option"`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input[type="radio"]')?.id, 'yes-option');
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) legend + input[type="radio"]')?.id, 'yes-option');
```
Your `radio` button should have a `name` attribute set to `"hotel-stay"`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input[type="radio"]')?.name, 'hotel-stay');
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) legend + input[type="radio"]')?.name, 'hotel-stay');
+```
+
+You should have a `label` element below your `radio` button.
+
+```js
+assert.exists(document.querySelector('fieldset:nth-of-type(2) input[type="radio"] + label'));
+```
+
+Your `label` element should have a `for` attribute set to `"yes-option"`.
+
+```js
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) input[type="radio"] + label')?.htmlFor, 'yes-option');
+```
+
+Your `label` element should have the text `Yes`.
+
+```js
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) input[type="radio"] + label')?.innerText?.trim(), 'Yes');
```
# --seed--
diff --git a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a954b2bcddba72076c1857.md b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a954b2bcddba72076c1857.md
index 9c178d6be69..bc54ea0321a 100644
--- a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a954b2bcddba72076c1857.md
+++ b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a954b2bcddba72076c1857.md
@@ -7,54 +7,54 @@ dashedName: step-20
# --description--
-Below your first radio button, add another `label` element with the `for` attribute set to `"no-option"`. The text for the `label` should be `No`.
+Below your `label` element, add a `radio` button with the `id` set to `"no-option"`, and the name attribute set to `"hotel-stay"`.
-Below your second `label` element, add a `radio` button with the `id` set to `"no-option"`, and the `name` attribute set to `"hotel-stay"`.
+Below your new `radio` button, add another `label` element with the `for` attribute set to `"no-option"`. The text for the `label` should be `No`.
When you are finished, you can now try out the radio buttons by selecting one option at a time.
# --hints--
-You should have a `label` element below your first radio button.
+You should have an `input` element below your first `label` element.
```js
-assert.isNotNull(document.querySelector('fieldset:nth-of-type(2) input[type="radio"] + label'));
+assert.isNotNull(document.querySelector('fieldset:nth-of-type(2) label + input'));
```
-Your `label` should have a `for` attribute set to `"no-option"`.
+Your `input` element should have a `type` attribute of `radio`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) input[type="radio"] + label')?.htmlFor, "no-option");
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input')?.getAttribute('type'), 'radio');
```
-Your `label` should have the text of `No`.
+Your `input` element should have an `id` attribute of `"no-option"`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) input[type="radio"] + label[for="no-option"]')?.textContent, 'No');
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input')?.id, 'no-option');
```
-You should have a second `input` below your second `label` element.
+Your `input` element should have a `name` attribute of `"hotel-stay"`.
```js
-assert.lengthOf(document.querySelectorAll('fieldset:nth-of-type(2) label + input'), 2);
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input')?.name, 'hotel-stay');
```
-Your `input` should have a `type` of `radio`.
+You should have a second `label` element below your second `input` element.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input:nth-of-type(2)')?.getAttribute('type'), 'radio');
+assert.isNotNull(document.querySelector('fieldset:nth-of-type(2) input:nth-of-type(2) + label'));
```
-Your `input` should have an `id` of `"no-option"`.
+Your `label` element should have a `for` attribute set to `"no-option"`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input:nth-of-type(2)')?.id, 'no-option');
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) input:nth-of-type(2) + label')?.htmlFor, "no-option");
```
-Your `input` should have a `name` of `"hotel-stay"`.
+Your `label` element should have the text `No`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input:nth-of-type(2)')?.name, 'hotel-stay');
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) input:nth-of-type(2) + label')?.textContent?.trim(), 'No');
```
# --seed--
@@ -98,8 +98,8 @@ assert.strictEqual(document.querySelector('fieldset:nth-of-type(2) label + input
diff --git a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9577022877d72d8f43b4f.md b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9577022877d72d8f43b4f.md
index da467950ccb..47fb30188f8 100644
--- a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9577022877d72d8f43b4f.md
+++ b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a9577022877d72d8f43b4f.md
@@ -74,10 +74,10 @@ assert.strictEqual(document.querySelector('fieldset:nth-of-type(3) legend')?.inn
--fcc-editable-region--
diff --git a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a95d0eff8168747805f1f3.md b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a95d0eff8168747805f1f3.md
index 061e48214b4..daba6fec048 100644
--- a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a95d0eff8168747805f1f3.md
+++ b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a95d0eff8168747805f1f3.md
@@ -14,62 +14,61 @@ Here is an example of how to work with checkboxes dealing with food options:
```html
```
The `value` attribute is used to specify the value that will be sent to the server when the form is submitted.
-Below your `legend` element, add a `label` element with the text of `Social Media Ads`. The `for` attribute should be set to `"ads"`.
+Below your `legend` element, add a checkbox `input` with the `id`, `name` and `value` attributes set to `"ads"`.
-Below your `label` element, add a checkbox input with the `id`, `name` and `value` attributes set to `"ads"`.
+Below your checkbox `input`, add a `label` element with the text `Social Media Ads`. The `for` attribute should be set to `"ads"`.
# --hints--
-You should have a `label` element below your `legend`.
+You should have a checkbox `input` below your `legend` element.
```js
-assert.exists(document.querySelector("fieldset:nth-of-type(3) legend + label"));
+assert.exists(document.querySelector("fieldset:nth-of-type(3) legend + input[type='checkbox']"));
```
-Your `label` element should have the text of `Social Media Ads`.
+Your checkbox `input` should have an `id` attribute set to `"ads"`.
```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) legend + label")?.textContent, "Social Media Ads");
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) legend + input[type='checkbox']")?.id, "ads");
+```
+
+Your checkbox `input` should have a `name` attribute set to `"ads"`.
+
+```js
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) legend + input[type='checkbox']")?.name, "ads");
+```
+
+Your checkbox `input` should have a `value` attribute set to `"ads"`.
+
+```js
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) legend + input[type='checkbox']")?.value, "ads");
+```
+
+You should have a `label` element below your checkbox `input`.
+
+```js
+assert.exists(document.querySelector("fieldset:nth-of-type(3) input[type='checkbox'] + label"));
+```
+
+Your `label` element should have the text `Social Media Ads`.
+
+```js
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) input[type='checkbox'] + label")?.textContent?.trim(), "Social Media Ads");
```
Your `label` element should have a `for` attribute set to `"ads"`.
```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) legend + label")?.getAttribute("for"), "ads");
-```
-
-You should have a checkbox `input` below your `label`.
-
-```js
-const inputElement = document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']");
-assert.strictEqual(inputElement?.parentElement.tagName, "FIELDSET");
-```
-
-Your checkbox should have an `id` attribute set to `"ads"`.
-
-```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']")?.id, "ads");
-```
-
-Your checkbox should have a `name` attribute set to `"ads"`.
-
-```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']")?.name, "ads");
-```
-
-Your checkbox should have a `value` attribute set to `"ads"`.
-
-```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']")?.value, "ads");
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) input[type='checkbox'] + label")?.getAttribute("for"), "ads");
```
# --seed--
@@ -113,10 +112,10 @@ assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input
--fcc-editable-region--
diff --git a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a96127422411756204bc1b.md b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a96127422411756204bc1b.md
index 6b91ea33fb1..a786932b972 100644
--- a/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a96127422411756204bc1b.md
+++ b/curriculum/challenges/english/blocks/workshop-hotel-feedback-form/66a96127422411756204bc1b.md
@@ -7,52 +7,52 @@ dashedName: step-23
# --description--
-Add another `label` with the text of `Personal Recommendation`. The `for` attribute should be set to `"recommendation"`.
+Add another checkbox `input` with the `id`, `name` and `value` attributes set to `"recommendation"`.
-Below the `label` element, add another checkbox `input` with the `id`, `name` and `value` attributes set to `"recommendation"`.
+Below the checkbox `input`, add another `label` with the text `Personal Recommendation`. The `for` attribute should be set to `"recommendation"`.
# --hints--
-You should have a `label` element below your checkbox.
+You should have a checkbox `input` below your `label` element.
```js
-assert.isNotNull(document.querySelector('fieldset:nth-of-type(3) input[type="checkbox"] + label'));
+assert.isNotNull(document.querySelector('fieldset:nth-of-type(3) label + input[type="checkbox"]'));
```
-Your `label` element should have the text of `Personal Recommendation`.
+Your checkbox `input` should have an `id` attribute set to `"recommendation"`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(3) input[type="checkbox"] + label')?.textContent, "Personal Recommendation");
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']")?.id, "recommendation");
+```
+
+Your checkbox `input` should have a `name` attribute set to `"recommendation"`.
+
+```js
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']")?.name, "recommendation");
+```
+
+Your checkbox `input` should have a `value` attribute set to `"recommendation"`.
+
+```js
+assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input[type='checkbox']")?.value, "recommendation");
+```
+
+You should have a `label` element below your checkbox `input`.
+
+```js
+assert.exists(document.querySelector("fieldset:nth-of-type(3) input[type='checkbox'] + label:nth-of-type(2)"));
+```
+
+Your `label` element should have the text `Personal Recommendation`.
+
+```js
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(3) input[type="checkbox"] + label:nth-of-type(2)')?.textContent?.trim(), "Personal Recommendation");
```
Your `label` element should have a `for` attribute set to `"recommendation"`.
```js
-assert.strictEqual(document.querySelector('fieldset:nth-of-type(3) input[type="checkbox"] + label')?.getAttribute("for"), "recommendation");
-```
-
-You should have a checkbox `input` below your `label`.
-
-```js
-assert.exists(document.querySelector("fieldset:nth-of-type(3) label + input:nth-of-type(2)[type='checkbox']"));
-```
-
-Your checkbox should have an `id` set to `"recommendation"`.
-
-```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input:nth-of-type(2)[type='checkbox']")?.id, "recommendation");
-```
-
-Your checkbox should have a `name` attribute set to `"recommendation"`.
-
-```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input:nth-of-type(2)[type='checkbox']")?.name, "recommendation");
-```
-
-Your checkbox should have a `value` attribute set to `"recommendation"`.
-
-```js
-assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input:nth-of-type(2)[type='checkbox']")?.value, "recommendation");
+assert.strictEqual(document.querySelector('fieldset:nth-of-type(3) input[type="checkbox"] + label:nth-of-type(2)')?.getAttribute("for"), "recommendation");
```
# --seed--
@@ -96,19 +96,19 @@ assert.strictEqual(document.querySelector("fieldset:nth-of-type(3) label + input