Added safe filter to model form headings