Working on query language