ticket:8 edit_link fixes