Search for usernames

Second version of #1460.

In the annotation.user field we store the users in the acct:username@domain format.
This change allows for us to both search for username and full user format.

Fix #1456
Yes it does. Good catch.