Fix url for join_columns.
Add database string scrubbing, and passback original query.
Merge branch 'development' of github.com:visgence/portcullis into development