Some URIs manipulation adjustments