Add option to output correct link/NIL in analyze