Bugfix doc multi issues (bug #2410)

Fixed partially. Will create "one commit", if ok.