Fixes to enable work order navigation