fixing the filter issue
fixing the filtering issue