Fix for most of remaining queries for audits. move activity from model to helper