Should fix url encoding once and for all