This looks nicer. Some fields were already using "-" as fallback, e.g. Speed, so this makes things more consistent too.