Add missing case to split_label function

Also rearranged in order (this is a bit useless)