changed parameters for orderBy
refactor ActivityController