Some upgrades and event name fix in OPTIONS filter.