Template fix for datasets with apps