Changed matching to empty string instead of NULL