Stream choice type validation update. Patch to verify if the value to be saved is valid