Code Review changes for Exposing stats in Queries and redesign