Address @wvu-r7's comments and better filtering