Fixes #10

Also change popularity from int to Integer
(popularity == 0 is something different than null)