Add check of string.Empty for AllAttributesFilled property