Enhancement 436

Determines whether URI should be extracted or not and updates the URI
with the appropriate extract flag.