renaming, and added a category to convert empty string to NSString properly