resolved fdo#72949 evaluate criteria on the query range

... and not on the result vector if that isn't included.
Actually implements a TODO introduced with
c008dc483f8c6840803983e7e351cec6fdd32070

Change-Id: Ic6c7ae70651aca21f22f10f76f94eb8690536bef
(cherry picked from commit a7d6e1f3eb60e4b73092dfe3f21501b4d150f041)