diff --git a/sentences/en/_common.yaml b/sentences/en/_common.yaml
index 957c9ddec4..a2e5e41227 100644
--- a/sentences/en/_common.yaml
+++ b/sentences/en/_common.yaml
@@ -124,7 +124,7 @@ lists:
         out: window
   lock_states:
     values:
-      - in: "[securely ]locked"
+      - in: "[securely] locked"
         out: "locked"
       - in: "unlocked"
         out: "unlocked"
@@ -244,7 +244,7 @@ lists:
 
   bs_power_states:
     values:
-      - in: "(powered[ on]|power detected)"
+      - in: "(powered [on]|power detected)"
         out: "on"
       - in: "(not powered|powered off)"
         out: "off"
@@ -361,40 +361,40 @@ lists:
     wildcard: true
 
 expansion_rules:
-  name: "[the ]{name}"
-  area: "[the ]{area}"
-  floor: "[the ]{floor}[ floor]"
+  name: "[the] {name}"
+  area: "[the] {area}"
+  floor: "[the] {floor} [floor]"
   area_floor: "(<area>|<floor>)"
-  in_area_floor: "[<in> ]<area_floor>"
-  what_is: "(what's|whats|what is|tell me)[ the]"
-  lockable: "[(the|my) ](lock|door|window|gate|garage door|shutter)[s]"
+  in_area_floor: "[<in>] <area_floor>"
+  what_is: "(what's|whats|what is|tell me) [the]"
+  lockable: "[(the|my)] (lock|door|window|gate|garage door|shutter)[s]"
   where_is: "(where's|wheres|where is)"
-  which: "(which|what)[ of the]"
-  is: "(is|are)[ (there|the)]"
+  which: "(which|what) [of the]"
+  is: "(is|are) [(there|the)]"
   are: "<is>"
-  any: "(any|some)[ of the]"
-  are_any: "[<are> ]<any>"
-  how_many: "how many[ of the]"
-  brightness: "{brightness}[[ ]%| percent]"
-  light: "[the ](light|lights|lighting|lamp|lamps)"
+  any: "(any|some) [of the]"
+  are_any: "[<are>] <any>"
+  how_many: "how many [of the]"
+  brightness: "{brightness}[ ][%|percent]"
+  light: "[the] (light|lights|lighting|lamp|lamps)"
   turn: "(turn|switch|change)"
   temp: "(temp|temperature)"
-  temperature: "{temperature}[([ ]°[ ][{temperature_unit}])|( degrees[ {temperature_unit}])]"
-  open: "(open|raise|lift)[ up]"
-  close: "(close|shut|lower)[ (up|down)]"
+  temperature: "{temperature}[[ ](°|degrees)[[ ]{temperature_unit}]]"
+  open: "(open|raise|lift) [up]"
+  close: "(close|shut|lower) [(up|down)]"
   set: "(set|make|change|turn)"
-  numeric_value_set: "(set|change|turn[ (up|down)]|increase|decrease|make)"
+  numeric_value_set: "(set|change|turn [(up|down)]|increase|decrease|make)"
   in: "(in|on|at|of)"
-  position: "{position}[[ ]%| percent]"
-  volume: "{volume:volume_level}[[ ]%| percent]"
+  position: "{position}[ ][%|percent]"
+  volume: "{volume:volume_level}[ ][%|percent]"
   currently: "(currently|presently|right now|at the moment)"
-  state: "[(present|current) ](state|status)"
+  state: "[(present|current)] (state|status)"
 
   # Context awareness expansion rules
-  all: "(all[[ of] the]|every[ single]|each[ and every])"
-  are_all: "[<are> ]<all>"
+  all: "(all [[of] the]|every [single]|each [and every])"
+  are_all: "[<are>] <all>"
   home: "(home|house|appartment|flat)"
-  everywhere: "(everywhere|in (all|each)[[ of] the] room[s]|in every room[s]|in the <home>)"
+  everywhere: "(everywhere|in (all|each) [[of] the] room[s]|in every room[s]|in the <home>)"
   here: "(here|in here|in this room|in the room)"
 
   # Questions
@@ -404,13 +404,13 @@ expansion_rules:
   timer_set: "(start|set|create)"
   timer_cancel: "(cancel|stop)"
   timer_duration_seconds: "{timer_seconds:seconds} second[s]"
-  timer_duration_minutes: "({timer_minutes:minutes} minute[s][ [and ]{timer_seconds:seconds} second[s]])|({timer_minutes:minutes} and[ a] {timer_half:seconds} minute[s])|({timer_half:seconds} a minute[s])"
-  timer_duration_hours: "({timer_hours:hours} hour[s][ [and ]{timer_minutes:minutes} minute[s]][ [and ]{timer_seconds:seconds} second[s]])|({timer_hours:hours} and[ a] {timer_half:minutes} hour[s])|({timer_half:minutes} an hour[s])"
+  timer_duration_minutes: "({timer_minutes:minutes} minute[s] [[and] {timer_seconds:seconds} second[s]])|({timer_minutes:minutes} and [a] {timer_half:seconds} minute[s])|({timer_half:seconds} a minute[s])"
+  timer_duration_hours: "({timer_hours:hours} hour[s] [[and]{timer_minutes:minutes} minute[s]] [[and] {timer_seconds:seconds} second[s]])|({timer_hours:hours} and [a] {timer_half:minutes} hour[s])|({timer_half:minutes} an hour[s])"
   timer_duration: "<timer_duration_seconds>|<timer_duration_minutes>|<timer_duration_hours>"
 
   timer_start_seconds: "{timer_seconds:start_seconds} second[s]"
-  timer_start_minutes: "{timer_minutes:start_minutes} minute[s][ [and ]{timer_seconds:start_seconds} second[s]]"
-  timer_start_hours: "{timer_hours:start_hours} hour[s][ [and ]{timer_minutes:start_minutes} minute[s]][ [and ]{timer_seconds:start_seconds} second[s]]"
+  timer_start_minutes: "{timer_minutes:start_minutes} minute[s] [[and] {timer_seconds:start_seconds} second[s]]"
+  timer_start_hours: "{timer_hours:start_hours} hour[s] [[and] {timer_minutes:start_minutes} minute[s]] [[and] {timer_seconds:start_seconds} second[s]]"
   timer_start: "<timer_start_seconds>|<timer_start_minutes>|<timer_start_hours>"
 
 skip_words: