Feat/polish url encoded

Cant be too obvious