Clarifying data source and improving metrics presentation