fixed coldstart sceanrio and added a watch on event handler registration