fixes-#2031
Merge pull request #2032 from dotCMS/issue-2031-fixes-required-on-salesforce-filter

fixes-#2031