fixed some url encoding issues