Fixed genre mapping
Merge branch 'master' into feature/subscribe