Minor changes for IE
Fix error with cookies when the unit's short name contains special characters