Improve history by putting marker for last tick
Discard invalid tokens or raise exception