Feat/polish url encoded