tag tokens with first and last

Change-Id: Icbec3de691f86c7d441bebddead738cfb3f7e6e3