Fix average percentage and View names