More hacks to fix boxes/toolboxes contents duplication