Added more greeks by category report handling code