uri-based navigation bugfix