Add zimbra id unique keys
Fix typo