diff --git a/astroid/scripts/move-tag.sh b/astroid/scripts/move-tag.sh
index 3649896..49868d0 100755
--- a/astroid/scripts/move-tag.sh
+++ b/astroid/scripts/move-tag.sh
@@ -5,7 +5,7 @@
 
 CURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-DEBUG=false    # use 'true' to echo verbose debug messages
+DEBUG=true    # use 'true' to echo verbose debug messages
 
 CSV="$CURDIR"/tag-list.csv    # Table of tags/folders
 MAILDIR="$HOME/Mails/FSFE"    # Maildir
@@ -48,6 +48,7 @@ DATELIMIT="30d"
 echo "Datelimit for search set to $DATELIMIT"
 
 while read line; do
+  if $(echo "$line" | grep -qE "^\s*#|^\s*$"); then continue; fi
   TAG=$(echo $line | cut -d";" -f1)
   FOL=$(echo $line | cut -d";" -f2)
 
diff --git a/astroid/scripts/tag-folder.sh b/astroid/scripts/tag-folder.sh
index 58c754f..1f355ea 100755
--- a/astroid/scripts/tag-folder.sh
+++ b/astroid/scripts/tag-folder.sh
@@ -15,7 +15,7 @@ function notmuch_rule {
 }
 
 while read line; do
-
+  if $(echo "$line" | grep -qE "^\s*#|^\s*$"); then continue; fi
   TAG=$(echo $line | cut -d";" -f1)
   FOL=$(echo $line | cut -d";" -f2)