Simplify queries in autosnap