Added fix for finder search.