Revise Filtermodel and Template-Modal