Refactoring, filter, added voliate for pending list.