Moved second decode step into the portal, which is passing query strings, so it should take that extra step.