Fix stats and extract command when a field has no value