Fixes query chaning of peer