Prevent duplicate parameters in the DS suggestions and fix Datasource creation to be more robust
Documentation typo, use built in PHP function