Skip PK on group-option; fix