Fixed OrderBy on company not working

Code cleaner, Change orderOn to orderBy
Modified Dao and service in order to accept the order by company