Use more general pattern
Correctly handle missing tags
New genres