Fixes #5554: Improve Directive Page !