Issue 2785 smart link field

Fixes point one of #2785
Still some questions open remains open - see failing test and #2785 comments.