Define get-in, assoc-in for trees.
Move addQuery to where it belongs