Issue #4 : not show fields if they are empty