improved label support

Signed-off-by: NurPech <nurpech@nurpech.de>