Fix issues with label api