few fixes which allows recomponenting same structure ... problems may occure if treat structure with component which alters some structure elements or fires some events