Added a default value when an empty string is send