Updates

Handle spaces and special characters in keys.