partial commit, improve modelize filter