fixed some issues with labels and ids

fixed some issues with labels and ids

Signed-off-by: John Hawkins <john@9seeds.com>