Tidy up file filter API