apply_finder_options refactored