Update api/validation service validation with service fields moved by #2086

To fix broken build