remove surname, fix link