HP: Fix categories