More plan_ahead fixing, menu width fixing
Fix filtering breaking during page update