Updates to Tag queries, cleanups, Snapshot matching