diff --git a/askomics/libaskomics/GffFile.py b/askomics/libaskomics/GffFile.py
index 71ac64bb..1bdc11e1 100644
--- a/askomics/libaskomics/GffFile.py
+++ b/askomics/libaskomics/GffFile.py
@@ -49,12 +49,8 @@ def __init__(self, app, session, file_info, host_url=None, external_endpoint=Non
     def set_preview(self):
         """Summary"""
         try:
-            # exam = GFFExaminer()
-            handle = open(self.path, encoding="utf-8", errors="ignore")
-            # gff_type = exam.available_limits(handle)['gff_type']
-            # for entity in gff_type:
-            #    self.entities.append(entity[0])
 
+            handle = open(self.path, encoding="utf-8", errors="ignore")
             data = defaultdict(lambda: set())
             for rec in GFF.parse(handle, target_lines=1):
                 for feature in rec.features:
@@ -190,11 +186,10 @@ def generate_rdf_content(self):
             for feature in rec.features:
 
                 filter_attributes = False
-                selected_attributes = []
+                selected_attributes = self.attributes_to_integrate.get(feature.type, [])
 
-                if self.attributes_to_integrate.get(feature.type):
+                if selected_attributes:
                     filter_attributes = True
-                    selected_attributes = self.attributes_to_integrate.get(feature.type, [])
 
                 # Entity type
                 entity_type = self.namespace_data[self.format_uri(feature.type, remove_space=True)]
diff --git a/askomics/react/src/routes/integration/gffpreview.jsx b/askomics/react/src/routes/integration/gffpreview.jsx
index d3138f33..a9d09c10 100644
--- a/askomics/react/src/routes/integration/gffpreview.jsx
+++ b/askomics/react/src/routes/integration/gffpreview.jsx
@@ -20,7 +20,8 @@ export default class GffPreview extends Component {
       privateTick: false,
       customUri: "",
       externalEndpoint: "",
-      subEntities: {}
+      subEntities: {},
+      errorMessage: null
     }
 
     let subEntities = {}
@@ -74,10 +75,6 @@ export default class GffPreview extends Component {
       })
   }
 
-  isChecked(value){
-    return this.state.entitiesToIntegrate.hasOwnProperty(value);
-  }
-
 
   handleSelection (event) {
     let value = event.target.value
@@ -143,7 +140,6 @@ export default class GffPreview extends Component {
     }
 
     let body
-    let id = 0
     if (this.props.file.error) {
       body = <ErrorDiv status={500} error={this.props.file.error} errorMessage={this.props.file.error_message} />
     } else {
@@ -155,16 +151,15 @@ export default class GffPreview extends Component {
             <div>
               <FormGroup check>
                 {Object.entries(this.state.availableAttributes).map(([key, values]) => {
-                id +=1
                 return (
+                <div key={key}>
                 <div>
-                <div>
-                  <p key={key + "_" + id}><Input value={key} onClick={this.handleSelection} type="checkbox"/> {key}</p>
+                  <p><Input value={key} onClick={this.handleSelection} type="checkbox"/> {key}</p>
                   <FormGroup check inline hidden={this.state.entitiesToIntegrate.has(key)? false : true}>
                   Attributes of the entity:
                   {
                     values.map((value, valkey) => {
-                      return (<div>&nbsp;<Input value={value} name={key} onClick={this.handleSubSelection} type="checkbox" defaultChecked={true} />{value}</div>)
+                      return (<div key={key + "_" + value}>&nbsp;<Input value={value} name={key} onClick={this.handleSubSelection} type="checkbox" defaultChecked={true} />{value}</div>)
                     })
                   }
                   </FormGroup>