Added missing filters and cleaned a few unnecessary scopes