ParamHandling: Fix minor bug in url with param generation

Url could inadvertently end with a &
Refactored request header adding code into smaller methods.

Testing Done: Ran Unit Tests.
Bug Number: none
Reviewed by: trivial