Re-sort the data and template relations
fixed bug