Group by source ok ! And fix some format