Hot fixes for category uniqueness (it should not)