fd0f71 Improve logic of gather_uri() function. Cleanup.

Authored and Committed by konstantin 4 years ago
    Improve logic of gather_uri() function. Cleanup.