Improve support for fetching multiple products in one query