Fixed small bug and made genre query faster