Fix concat
Cleanup queries.xml
Escaper