Improved product collection query