REF: add target to fields potentially containing path variables.
REF: add target to fields potentially containing path variables.

cournape/Bento,cournape/Bento,abadger/Bento,abadger/Bento,abadger/Bento,cournape/Bento,abadger/Bento,cournape/Bento