added support for resolving usernames
Added search for user support