Update tags

Add optional as requested by Liuxinyu970226. Also updated casing and
sorting.

Change-Id: Ic42f74895fc7aa2984cf5b59c29ad498e888d142