Fixed spells with spaces issue (use an underscore for spells for
multiword spells)