Merge "cmds/service: Fix categoryCount"