autolinking improvements