Post substitution the extra URL encode will be skipped

Fix #1705

When we do a substitution each component of the substituted string
was subjected to an extra round of URL encoding. This was happening
just for relationships. This extra URL encoding has been removed
till we have a valid usecase for it. With the extra substitution we
would convert a string like TEST/DEMO to TEST%2FDEMO, which is incorrect
without the knowledge about how the string is going to be used.