Update category tags

Please review. Thanks!