Minor changes on filtering system