Bit more filter refactoring
Bit more filter refactoring

yamingd/stronglink,guiquanz/stronglink,iOSCowboy/stronglink,yamingd/stronglink,Ryezhang/stronglink,rmoorman/stronglink,iOSCowboy/stronglink,Lacra17/stronglink,btrask/stronglink,shaunstanislaus/stronglink,rmoorman/stronglink,btrask/stronglink,Lacra17/stronglink,nkatsaros/stronglink,feld/stronglink,yamingd/stronglink,Ryezhang/stronglink,Lacra17/stronglink,nkatsaros/stronglink,btrask/stronglink,feld/stronglink,feld/stronglink,guiquanz/stronglink,guiquanz/stronglink,shaunstanislaus/stronglink,Ryezhang/stronglink,iOSCowboy/stronglink,nkatsaros/stronglink,shaunstanislaus/stronglink,btrask/stronglink,rmoorman/stronglink