fixed history for containers
refactoring