SONARANDRO-4 Better support for Emma reports