fix Null check; fix sorting; add link support