Fixes #10

Also change popularity from int to Integer
(popularity == 0 is something different than null)
Merge pull request #11 from kaaes/track_search_fix

Fixes #10