changes to account for Tripod's revised querying