History and List fix