Updated a couple more filters