PAHMA-1085: further revisions to 'autosuggest' and some datasource paramters