Correctly handles categories besides "broadcast"