I went looking for the reason why searches weren't filtering properly. So I'm not sure what's going on but filtering by site only (which seems to be the only option left) doesn't help at all.