Change site name to site ID; add getQuery() method.