Improve validation of inter links