diff --git a/components/BookingWidget/MobileToggleButton/index.tsx b/components/BookingWidget/MobileToggleButton/index.tsx
index 9159ef400..80026ff93 100644
--- a/components/BookingWidget/MobileToggleButton/index.tsx
+++ b/components/BookingWidget/MobileToggleButton/index.tsx
@@ -80,7 +80,7 @@ export default function MobileToggleButton({
       {!locationAndDateIsSet && (
         <>
           <div>
-            <Caption color="red">
+            <Caption type="bold" color="red">
               {intl.formatMessage({ id: "Where to" })}
             </Caption>
             <Body color="uiTextPlaceholder">
@@ -91,7 +91,7 @@ export default function MobileToggleButton({
           </div>
           <Divider color="baseSurfaceSubtleNormal" variant="vertical" />
           <div>
-            <Caption color="red">
+            <Caption type="bold" color="red">
               {intl.formatMessage(
                 { id: "booking.nights" },
                 { totalNights: nights }
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx
index a8736e69d..c66c8e10b 100644
--- a/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx
@@ -29,17 +29,23 @@ export default function SearchList({
 }: SearchListProps) {
   const intl = useIntl()
   const [hasMounted, setHasMounted] = useState(false)
+  const [isFormSubmitted, setIsFormSubmitted] = useState(false)
   const {
     clearErrors,
-    formState: { errors },
+    formState: { errors, isSubmitted },
   } = useFormContext()
   const searchError = errors["search"]
 
+  useEffect(() => {
+    setIsFormSubmitted(isSubmitted)
+  }, [isSubmitted])
+
   useEffect(() => {
     let timeoutID: ReturnType<typeof setTimeout> | null = null
     if (searchError && searchError.message === "Required") {
       timeoutID = setTimeout(() => {
         clearErrors("search")
+        setIsFormSubmitted(false)
         // magic number originates from animation
         // 5000ms delay + 120ms exectuion
       }, 5120)
@@ -60,7 +66,7 @@ export default function SearchList({
     return null
   }
 
-  if (searchError) {
+  if (searchError && isFormSubmitted) {
     if (typeof searchError.message === "string") {
       if (!isOpen) {
         if (searchError.message === "Required") {
diff --git a/components/Forms/BookingWidget/FormContent/Search/index.tsx b/components/Forms/BookingWidget/FormContent/Search/index.tsx
index 5461426a7..109af79a3 100644
--- a/components/Forms/BookingWidget/FormContent/Search/index.tsx
+++ b/components/Forms/BookingWidget/FormContent/Search/index.tsx
@@ -48,13 +48,10 @@ export default function Search({ locations }: SearchProps) {
     dispatch({ type: ActionType.CLEAR_HISTORY_LOCATIONS })
   }
 
-  function handleOnChange(
-    evt: FormEvent<HTMLInputElement> | ChangeEvent<HTMLInputElement>
-  ) {
-    const value = evt.currentTarget.value
-    if (value) {
+  function dispatchInputValue(inputValue: string) {
+    if (inputValue) {
       dispatch({
-        payload: { search: value },
+        payload: { search: inputValue },
         type: ActionType.SEARCH_LOCATIONS,
       })
     } else {
@@ -62,6 +59,14 @@ export default function Search({ locations }: SearchProps) {
     }
   }
 
+  function handleOnChange(
+    evt: FormEvent<HTMLInputElement> | ChangeEvent<HTMLInputElement>
+  ) {
+    const newValue = evt.currentTarget.value
+    setValue(name, newValue)
+    dispatchInputValue(value)
+  }
+
   function handleOnFocus(evt: FocusEvent<HTMLInputElement>) {
     const searchValue = evt.currentTarget.value
     if (searchValue) {
@@ -114,6 +119,7 @@ export default function Search({ locations }: SearchProps) {
       inputValue={value}
       itemToString={(value) => (value ? value.name : "")}
       onSelect={handleOnSelect}
+      onInputValueChange={(inputValue) => dispatchInputValue(inputValue)}
     >
       {({
         closeMenu,
@@ -128,7 +134,11 @@ export default function Search({ locations }: SearchProps) {
       }) => (
         <div className={styles.container}>
           <label {...getLabelProps({ htmlFor: name })} className={styles.label}>
-            <Caption color={isOpen ? "uiTextActive" : "red"} asChild>
+            <Caption
+              type="bold"
+              color={isOpen ? "uiTextActive" : "red"}
+              asChild
+            >
               <span>
                 {state.searchData?.type === "hotels"
                   ? state.searchData?.relationships?.city?.name
diff --git a/components/Forms/BookingWidget/index.tsx b/components/Forms/BookingWidget/index.tsx
index 8c9ccb48e..731e17033 100644
--- a/components/Forms/BookingWidget/index.tsx
+++ b/components/Forms/BookingWidget/index.tsx
@@ -65,11 +65,7 @@ export default function Form({ locations, type }: BookingWidgetFormProps) {
         id={formId}
       >
         <input {...register("location")} type="hidden" />
-        <FormContent
-          locations={locations}
-          formId={formId}
-          formState={formState}
-        />
+        <FormContent locations={locations} formId={formId} />
       </form>
     </section>
   )
diff --git a/components/GuestsRoomsPicker/GuestsRoomsPicker.tsx b/components/GuestsRoomsPicker/GuestsRoomsPicker.tsx
index 99c1324ab..8950a1585 100644
--- a/components/GuestsRoomsPicker/GuestsRoomsPicker.tsx
+++ b/components/GuestsRoomsPicker/GuestsRoomsPicker.tsx
@@ -27,7 +27,7 @@ export default function GuestsRoomsPicker({
     id: "Disabled booking options header",
   })
   const disabledBookingOptionsText = intl.formatMessage({
-    id: "Disabled booking options text",
+    id: "Disabled adding room",
   })
   const addRoomLabel = intl.formatMessage({ id: "Add Room" })
 
diff --git a/i18n/dictionaries/da.json b/i18n/dictionaries/da.json
index 865dc6853..8bc08cc13 100644
--- a/i18n/dictionaries/da.json
+++ b/i18n/dictionaries/da.json
@@ -11,9 +11,9 @@
   "Accessibility": "Tilgængelighed",
   "Accessible Room": "Tilgængelighedsrum",
   "Activities": "Aktiviteter",
+  "Add Room": "Tilføj værelse",
   "Add code": "Tilføj kode",
   "Add new card": "Tilføj nyt kort",
-  "Add room": "Tilføj værelse",
   "Address": "Adresse",
   "Adults": "voksne",
   "Airport": "Lufthavn",
@@ -90,6 +90,7 @@
   "Destination": "Destination",
   "Destinations & hotels": "Destinationer & hoteller",
   "Details": "Detaljer",
+  "Disabled adding room": "Tilføjelse af rum er endnu ikke tilgængelig på den nye hjemmeside.",
   "Disabled booking options header": "Vi beklager",
   "Disabled booking options text": "Koder, checks og bonusnætter er endnu ikke tilgængelige på den nye hjemmeside.",
   "Discard changes": "Kassér ændringer",
diff --git a/i18n/dictionaries/de.json b/i18n/dictionaries/de.json
index 3187d3855..e72d5bffc 100644
--- a/i18n/dictionaries/de.json
+++ b/i18n/dictionaries/de.json
@@ -11,9 +11,9 @@
   "Accessibility": "Zugänglichkeit",
   "Accessible Room": "Barrierefreies Zimmer",
   "Activities": "Aktivitäten",
+  "Add Room": "Zimmer hinzufügen",
   "Add code": "Code hinzufügen",
   "Add new card": "Neue Karte hinzufügen",
-  "Add room": "Zimmer hinzufügen",
   "Address": "Adresse",
   "Adults": "Erwachsene",
   "Airport": "Flughafen",
@@ -90,6 +90,7 @@
   "Destination": "Bestimmungsort",
   "Destinations & hotels": "Reiseziele & Hotels",
   "Details": "Details",
+  "Disabled adding room": "Zum Hinzufügen eines Zimmers ist derzeit nicht möglich.",
   "Disabled booking options header": "Es tut uns leid",
   "Disabled booking options text": "Codes, Schecks und Bonusnächte sind auf der neuen Website noch nicht verfügbar.",
   "Discard changes": "Änderungen verwerfen",
diff --git a/i18n/dictionaries/en.json b/i18n/dictionaries/en.json
index 0ae7ba348..177c4a803 100644
--- a/i18n/dictionaries/en.json
+++ b/i18n/dictionaries/en.json
@@ -14,7 +14,6 @@
   "Add Room": "Add room",
   "Add code": "Add code",
   "Add new card": "Add new card",
-  "Add room": "Add room",
   "Add to calendar": "Add to calendar",
   "Address": "Address",
   "Adults": "Adults",
@@ -96,6 +95,7 @@
   "Destination": "Destination",
   "Destinations & hotels": "Destinations & hotels",
   "Details": "Details",
+  "Disabled adding room": "Adding room is not available on the new website yet.",
   "Disabled booking options header": "We're sorry",
   "Disabled booking options text": "Codes, cheques and reward nights aren't available on the new website yet.",
   "Discard changes": "Discard changes",
diff --git a/i18n/dictionaries/fi.json b/i18n/dictionaries/fi.json
index 36b424139..28703bc14 100644
--- a/i18n/dictionaries/fi.json
+++ b/i18n/dictionaries/fi.json
@@ -11,9 +11,9 @@
   "Accessibility": "Saavutettavuus",
   "Accessible Room": "Esteetön huone",
   "Activities": "Aktiviteetit",
+  "Add Room": "Lisää huone",
   "Add code": "Lisää koodi",
   "Add new card": "Lisää uusi kortti",
-  "Add room": "Lisää huone",
   "Address": "Osoite",
   "Adults": "Aikuista",
   "Airport": "Lentokenttä",
@@ -90,6 +90,7 @@
   "Destination": "Kohde",
   "Destinations & hotels": "Kohteet ja hotellit",
   "Details": "Tiedot",
+  "Disabled adding room": "Lisäämään huone on vielä saatavilla uudella verkkosivustolla.",
   "Disabled booking options header": "Olemme pahoillamme",
   "Disabled booking options text": "Koodit, sekit ja palkintoillat eivät ole vielä saatavilla uudella verkkosivustolla.",
   "Discard changes": "Hylkää muutokset",
diff --git a/i18n/dictionaries/no.json b/i18n/dictionaries/no.json
index 6aa6def5c..f1f0a38ac 100644
--- a/i18n/dictionaries/no.json
+++ b/i18n/dictionaries/no.json
@@ -11,9 +11,9 @@
   "Accessibility": "Tilgjengelighet",
   "Accessible Room": "Tilgjengelighetsrom",
   "Activities": "Aktiviteter",
+  "Add Room": "Legg til rom",
   "Add code": "Legg til kode",
   "Add new card": "Legg til nytt kort",
-  "Add room": "Legg til rom",
   "Address": "Adresse",
   "Adults": "Voksne",
   "Airport": "Flyplass",
@@ -89,6 +89,7 @@
   "Destination": "Destinasjon",
   "Destinations & hotels": "Destinasjoner og hoteller",
   "Details": "Detaljer",
+  "Disabled adding room": "Legg til rom er enda ikke tilgjengelig på den nye nettsiden.",
   "Disabled booking options header": "Vi beklager",
   "Disabled booking options text": "Koder, checks og belønningsnætter er enda ikke tilgjengelige på den nye nettsiden.",
   "Discard changes": "Forkaste endringer",
diff --git a/i18n/dictionaries/sv.json b/i18n/dictionaries/sv.json
index bff5462fd..0aeb71644 100644
--- a/i18n/dictionaries/sv.json
+++ b/i18n/dictionaries/sv.json
@@ -11,9 +11,9 @@
   "Accessibility": "Tillgänglighet",
   "Accessible Room": "Tillgänglighetsrum",
   "Activities": "Aktiviteter",
+  "Add Room": "Lägg till rum",
   "Add code": "Lägg till kod",
   "Add new card": "Lägg till nytt kort",
-  "Add room": "Lägg till rum",
   "Address": "Adress",
   "Adults": "Vuxna",
   "Airport": "Flygplats",
@@ -89,6 +89,7 @@
   "Destination": "Destination",
   "Destinations & hotels": "Destinationer & hotell",
   "Details": "Detaljer",
+  "Disabled adding room": "Lägg till rum är inte tillgängligt än på den nya webbplatsen.",
   "Disabled booking options header": "Vi beklagar",
   "Disabled booking options text": "Koder, bonuscheckar och belöningsnätter är inte tillgängliga på den nya webbplatsen än.",
   "Discard changes": "Ignorera ändringar",
diff --git a/types/components/form/bookingwidget.ts b/types/components/form/bookingwidget.ts
index e655b8b59..997890ca3 100644
--- a/types/components/form/bookingwidget.ts
+++ b/types/components/form/bookingwidget.ts
@@ -14,7 +14,6 @@ export interface BookingWidgetFormProps {
 export interface BookingWidgetFormContentProps {
   locations: Locations
   formId: string
-  formState: FormState<BookingWidgetSchema>
 }
 
 export enum ActionType {
