Don't exclude 'system' from groups in drop-down

This is in develop as #795, now for dev_4_4...