history behavior fixes