added few corrections for table events