include both original and resolved target URLs in handlers

since resolving sometimes fails during poll, but later succeeds in the handler.