Fixed url encoding bug