Feature excelexport - last changes

This merge request includes the last chanbges requested by the product owner (see comment on last merge requests, for more details)