re-add safe_id
re-add safe_ref to prefix