Move context query string into debug output