Finish old filter logic