Feat/polish url encoded

Where's michael? :-1: