more work on filter template
more work on model template