Refined attribute exlusion
Fixed up reporting module