updated to allow for better genre and classifier grooming