Make rename widget and history model work better