Fix tests
Don't break if the search query is null
Merge branch 'master' into playback-info