restored support for html view for the new queries, and improved export as csv workflow