Improved vertex.Both() query