Added support for querying by site id