Fixed bugs with editing steps and funnels