Added support for querying by user.