fixup! First cut of category navigation entity
fixup! First cut of category navigation reader