Better support for export as a query next step
Nicer history management