Better label handling (bug fix with filter in the label)