improved performance of plan toggle date