BugFix: Prevent categories from swapping when not changing cats