Add filters to time and cost
Change message to update
Remove fieldsets