removing calculated fields from filter