508 fixes, empty label