ARQ-1831 & ARQ-1839 fixed

Here you can find preview of the report:
https://rawgit.com/jhuska/a72e48b12563d77404cb/raw/b0794a422a1b8337578757dfa6b7d0e4d279ed64/report4.html