fixes #7608 use friendly_id