Fix issues with genre lists