Add quotes around labels.
Update grammar for our chosen extensions.