updated filtering with data prep...