[BUGFIX] Followup Fluid Template Fallback paths