diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index 7b45e4a..6a6e13b 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -38,7 +38,7 @@ gcode:
     {% set BEEPING_ENABLED=printer["gcode_macro _globals"].beeping_enabled|default(-1)|int %}
 
     {% if BEEPING_ENABLED == 1 %}
-        BEEP I=i DUR=dur FREQ=freq
+        BEEP I={i} DUR={dur} FREQ={freq}
     {% endif %}
 
 [gcode_macro ADJUST_FILAMENT_SENSOR_STATUS]
@@ -49,7 +49,7 @@ gcode:
     {% set FILAMENT_SENSOR_ENABLED=printer["gcode_macro _globals"].filament_sensor_enabled|default(-1)|int %}
 
     {% if FILAMENT_SENSOR_ENABLED == 1 and NEWSTATUS != -1 %}
-        SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=NEWSTATUS
+        SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE={NEWSTATUS}
     {% endif %}
 
 [gcode_macro CHECK_PRE_PURGE_PRIME_LENGTH]
@@ -112,6 +112,7 @@ gcode:
     {% set chambertemp = params.CHAMBER|default(0)|int %}
     
     ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
+    SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
 
     G28 X Y
     # <insert your routines here>
@@ -130,6 +131,7 @@ gcode:
 [gcode_macro PRINT_END]
 gcode:
     ADJUST_FILAMENT_SENSOR_STATUS ENABLE=0
+    SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
     CONDITIONAL_BEEP I=2 DUR=30 FREQ=8500                               ; NOTE Comment out this line to stop the beeps at the end of a print
     {% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length|default(1.40)|float %}
     M400                                    ; wait for buffer to clear
@@ -198,6 +200,7 @@ gcode:
         SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target}    ; set hotend temp variable for reference in resume macro
 
         ADJUST_FILAMENT_SENSOR_STATUS ENABLE=0
+        SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
         SAVE_GCODE_STATE NAME=PAUSE                                                          ; save current print position for resume
         BASE_PAUSE                                                                           ; pause print
         {% if (printer.gcode_move.position.z + z) < printer.toolhead.axis_maximum.z %}       ; check that zhop doesn't exceed z max
@@ -224,6 +227,7 @@ gcode:
 
     {% if printer['pause_resume'].is_paused|int == 1 %}
         ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
+        SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
 
         SET_IDLE_TIMEOUT TIMEOUT={printer.configfile.settings.idle_timeout.timeout}  ; set timeout back to configured value
         {% if etemp > 0 %}