Refactor vectoriel queries