Fixing build bustage caused by not correctly updating filter exceptions (and in a couple cases not filtering when it would make sense)