Changed handling of navigate triggers