Fix Activity Report

Adapt code for Staff
Fix $where (Type & User filters)