Sanitized strings, moved a hook for better join message timing