performance + fixes duplicated label