Tidy ups on order by for extended activity report