correction for inactive resources that block the filter
Merge origin/master