renaming query expression to query