Label bugfix & optimization