Hardening and improving ba back/forward workflow