Better implementation of options for file filtering