Upgrade deps and minor fixes to get query browser working.
So this Query tool is somewhat working now.