historybehaviors fixes