Fixed shelf creations so that all elements are added to the same parent accordion