Categories weren't retaining the same hierarchy in some situations, fixed