Remove orderby to workaround PG issue