Add ORDER BY planning