Added query count to output and default args