Filter settings calendar and tree improved.
Merge branch '5.0'