Correct handling of missing queries data
Add test data to enable playing with it and allow easy testing