Better linking with url check