renamed `use_raw_id` to `raw_id`