Working on genres & tags again

As above.