changed URI handling