Update so #each works with root context (fix from all that merging)