CORE-341 Script error when filtering by object
Merge pull request #1894 from reciprocity/hotfix/script-error-on-filter-objects

CORE-341 Script error when filtering by object