104 move custom filters to models