Fix history
Fix dialog