#39 - Set the right targets for some link fields