Added naked expressions in queries and the primitive query OK.