before restructure data filter