Split the low level dump query so that it finishes in a reasonable amount of time
Improve the output