Fix issues with fallback tags