Fix AppTemplateAdvanced