Updated labeling to expand tokens
(cherry picked from commit bcba826c1207621de57d58555913ef093ba2aa8b)

Signed-off-by: Joe Hansche <jhansche@meetme.com>