added empty label again, added handling for it