:+1: on this change, those should definitely be filters.  I don't think elasticsearch is a big performance bottleneck, but still, this is a good change.