Switch to parsing category labels a different way to get Extra working. Fixes a bug in General too.