Properly guard against null queries in layer options
Merge branch '2.1' of github.com:CartoDB/cartodb20 into 2.1