Force categories to contain the primary category regardless of UI. Fixes #3