tweaks to query interfaces.