Revised report dictionary logic