remove filter logic until stable