Combine all scope filtering logic behind one ScopeFilter implementation

Combine all scope filtering logic behind one ScopeFilter implementation #1453