Fixed bug
Improve query generation / user shown query