Handle data in product tree leaves correctly

- Some general improvements to the navigation service