Fix an issue where a custom source would have "&" for the first query parameter instead of "?"#45