Change URL structures so that they don't need to be encoded