Deal with encoded parameters correctly