Corrections for raw vs. encoded URLs. Ugh