use only_if
fix FC023
Add name in metadata
fix FC045