Component entity id fixed
Sort fixed