Fix nonfiction genre id
Merge branch 'mp4tags'