OPAL-2292: Reverting changes that dropped existing categories
OPAL-2292: Reset derivation destination when changing categorization method.