Thx very much.
First test looks quite good in simulation. Will try your modifikation in real navigation and report back.