Added filterResolveList() etc.