some issues related to missing template and graph reload added