More queries and language constants rewritten