Fix issue with x-target-uri handling. It shall be removed all the time when...

Fix issue with x-target-uri handling. It shall be removed all the time when resolved, unless for fallback route, which is by definition not something used when a target uri is resolved.