Further improvement on genre. Should be faster now