Fix query
Remove debug info