REST API Input Validation Refactor and fixing [RTFACT-18603]