now returns products in good order
Merge branch 'feature-2opt' into develop