[discover] Cannot read property 'query' of undefined
Merge pull request #2028 from spenceralger/fix-2022

[discover] Cannot read property 'query' of undefined