Fixed issue in data.js returning empty string instead of null