Add curator filter;
fix bugs with other parts of filter.