Cleanup field order and label on request content type (2)