Fixing sorting issue in component and form manager, not other modules yet  #823