Added possibility to enter a default value in templates in expand function (Util) + minor fixes to Shell