close wrapped components into single, fix broken and missing component attributes