Add select to query inspect
Handle type tagged values in query inspect