Fixed issue with undefined and other genres
Merge branch 'undefined-genre' into develop