change so that getActivityQuery limiting happens outside.