Also remove empty values when creating a fabric