#1909 | Moved logic to find unique orders