Added empty string instead of null for string params