GG-1768 fixed navigation with orders