improve label handling
export