Made URL params reflect in body and vice-versa

New PR with clean code! Made properly!