Fix some URL encoding issues