EDIT - add filter_var for data fields