Fixing genre not added on credit creation and other bugs