fixes query language, simpler.