Add ability to send debugQuery link in query string
Cleanup