fixes

scripts/extract-used-tags.sh

@@ -13,6 +13,7 @@ tr '\t' ' '                       | # translate all tabs to spaces
 tr -s ' '                         | # squeeze all spaces
 sed 's/ [0-9A-Za-z/#_-]* ;//'     | # get rid of all contlexes
 cut -d':' -f1                     | # get rid of the surface side
+sed -e 's/ /_/g'                  | # we don't care about mwe with spaces here
 grep -E '[@+][0-9A-Za-z][0-9A-Za-z@+]' |  # Only keep interesting strings
 sed 's/@@/@€@/g'                  | # insert newline placeholder between flag diacritics
 sed 's/@+/@€+/g'                  | # insert newline placeholder between flag and tag
@@ -25,5 +26,6 @@ sed '/^\+/ s/\+/€+/g'             | # if begins with +, insert newlines before
 sed '/\+$/ s/\+/\+€/g'            | # if ends with +, insert newlines after + (prefix tags)
 tr '€' '\n'                       | # insert newlines
 grep '[\+@].'                     | # keep only interesting stuff
+grep -E -o '@[^@]*@|\+[^+@]*'       | # output only taggy flaggy parts
 sed -e 's/[-%]*$//' -e 's/^[-%]*//'
 # Get rid of final stuff that is odd