Committing for Dan the filter supprt for template fields. Ionica was not present to grant access to Dan