fix history bug
implement marker