Better apod link matching