Make sure empty strings are escaped
closes #134