Fix NullPointer issue when group limits are removed
Improve documentation