Modify `order` calls to hopefully appease MySQL