Fix query- was choking on too 250+ groups