Various fixes for groups

Various fixes for extended template

Add restart to one script