Revamp Filter System.