Slight fixes to Add Genre to make it work