Working on the form generator filter