WP-4736 category fixes