Fix docs
Improve grp parsing and avoid error 500