ug-2389 - respect limit on connection query