Update filter to incorperate mentioned changes