Always return QueryResults from map and filter

Fixes #17681