Work on the TableDataGenerator
Moved filter from table layout to field