Hotfix/3858 - findHelper problem in Navigation Helper

- update creation of internal hash
- more unit tests added