DF#QCADOOMES-1949 Fixed problem with '-' in reports and some refactor.