make sure we don't get a result like my-page/?&var=value
Merge pull request #1677 from Remo/fix-url-builder

make sure we don't get a result like my-page/?&var=value