Fixed fixtures so the tree reflects coherent values
Refactoring: extracted to a method the scope restriction logic

- To reduce code duplication
- Fix in a BC way (ie: not introduce a new public method)
Recover the tree of both scoped menus when moving a link

- Closes #368
Merge branch 'pr/222'
Fix: Only escape title for insert attachment action
Merge remote-tracking branch 'upstream/master'