Finder more elegant
renaming finder filter, adding some spec tests