Fixed local to use label and id