Improve template of suspensionList and add condition