Added case_id to model, changed way of counting in reports