reverting and fixing the filtering problem