Update friendly_id; fixes two spec failures, causes three new ones