Fix data-pre render for stop areas and add time_table with token input Refs #0028814
Merge