(#2050) - Follow up to remove decode uri