HOTFIX: Fix problem with searchId parameter in navigation