Fix filtering regression 3 2

Created by: myronmarston

This fixes #1889 (closed) for 3.2. I anticipate implementing a slightly different fix for master since the filter manager has changed in master for example ids.

Before 35137e0c, when a location filter and CLI tag filter were combined, the tag filter was completely ignored. Our fix here is a middle ground between the old behavior and the improvement of 35137e0c: for examples defined in a file for which there is a location filter, we only apply the location filter; for other examples we still apply the non-location inclusion filters.