Better filter selection for SF