update to fix parsing (safestring)