fixing #48 - group queries now have an optional limit