Revert "Revert "Merge genres on output""

This reverts commit 02d4a4f6bdab94b30f530f44b2a10f3b71d4e9d0.