Rework named scoped for category