Change order by to avoid postgres issue. This is likely less than ideal.