Fix tests and propagation of 'emails' field.
[jan] Replace categories with tags.
Remove now incorrect comment.