added update to ravenevent, it should use static index instead of dynamic
fixed merge