Add URI where information was discovered

This adds the URI where the information was enumerated from to the
scanner output.

One more place where target_uri was being used was also corrected.