Added support for searching users by username and email