Improve query presentation
Escape url parameters