Filter & Colour Fixes

Huge issues with filtering… (individual terms use AND… would be better
if taxonomies used AND and taxonomy terms used OR). And colour hues
cannot have dashed in the slug!!!!!!!!!!!!!!!!