preset bot changes

preset bot changes
Merge branch 'awakeel_7.4' into _MEE
filters and salesforce fixes