label fix & uid support