WIP: include query history