AC_WPNav: advance track fixes