clipfish: genre fixes
clipfish: regex fixes
Merge remote-tracking branch 'vumedia/master'