do not add a questionmark at the end of the assembled url when no query ...

...string is present