created FilterResolver and cleaned Finder even more