AI-406 : added reference fields update
AI-416 : pushed down marker event handler instead of dispatcher