Improve Nitro Genre extraction