Added support for category entries with multiple words. Fixed a bug where renamed category entries weren't removed.