LinkService Improvment

more to do