Improved genre mapping from Nitro to YouView