Fix availiblity service
Fix navigation service

- Used to expand rights on leafs