Increase event parsing accuracy and improve call selection for drawing