Mbst 10092 tva improvements ep2

Added missing fields to the Nitro > YouView mapping
so if the input genre equals a certain string, we add it twice, once with a type of 'main' and once without? That doesn't seem quite right...