Component type sort fix