adjust and removal of problematic navigation