misc query/plot updates