Remove filter_var dependency