Fix models to conform with API.md on result_id