Fix missing "order by id" (Closes #20)