Updated analysis queries to be more insightful.