Added scopeFilterRelatedIndexes