Revert previous attempt to improve genre filtering. This needs more
thought.