Support for source with other parameters in the url construct closes #239 closes #281 closes #251