Reverted to include URL encode for doc id