fix the FILTER issue