tweak SQL, remove extra columns from order by