Fix some containers opening another ones and fix tooltip for a barrel
Merge pull request #384 from AMDmi3/map-fix

Fix some containers opening another ones and fix tooltip for a barrel