Added sortable timestamp and fixed event bug