[#818] Try order by id to prevent test fail
Merge branch '818-attempt-to-fix-recuring-test-fail'