cleanup link macro processing; pass id as node property