Fix warning
Fixes for URIs
Remave URI params