Make messaging fixes for 60-item/year limit