+ Forms within generic list should support tokens

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2001 from live627/dev

+ Forms within generic list should support tokens