Links & Pictures parsing improved