Use static call to Environment class
No need to add and remove later ;-)
Remove ampersand before and after query string
Added more unit tests for Haste\Util\Url
Clean query string when removing some
Even more test for \Haste\Util\Url
Only add question mark if we have query parameters