Added order by in solar