include zero count genres in calculations + other fixes