added underscore and sort by genre