diff --git a/src/app/components/toggle/toggle.component.ts b/src/app/components/toggle/toggle.component.ts
index c3644b4a0bc371aebc118fff8b8490288db35491..6b3967634e8c9a3da29b32d0e380fc9f025793d9 100644
--- a/src/app/components/toggle/toggle.component.ts
+++ b/src/app/components/toggle/toggle.component.ts
@@ -27,6 +27,8 @@ export class ToggleComponent implements OnInit {
   }
 
   public toggle(value: boolean) {
+    if(this.value === value)
+      return;
     this.value = value;
     this.valueChange.emit(this.value);
   }
diff --git a/src/app/services/netex-controller/netex-controller.service.ts b/src/app/services/netex-controller/netex-controller.service.ts
index 145db2b7af2cfdd8ca8d915fec023c4506ef39c7..93546b84d6b2c38159e5e7e0b1da4b647e1d0c98 100644
--- a/src/app/services/netex-controller/netex-controller.service.ts
+++ b/src/app/services/netex-controller/netex-controller.service.ts
@@ -97,13 +97,12 @@ export class NetexControllerService {
   }
 
   public adjacentDisorders(nodes: Node[]): Observable<any> {
-    const genesBackendIds = nodes.map((node: Node) => node.netexId && !node.drugId ? node.netexId.slice(1) : undefined).filter(id => id != null);
-    const drugsBackendIds = nodes.map((node: Node) => node.drugId && node.netexId ? node.netexId.slice(1) : undefined).filter(id => id != null);
+    const genesBackendIds = nodes.map((node: Node) => node.netexId && !node.drugId && node.netexId.startsWith('p') ? node.netexId.slice(1) : undefined).filter(id => id != null);
+    const drugsBackendIds = nodes.map((node: Node) => node.drugId && node.netexId && node.netexId.startsWith('dr') ? node.netexId.slice(1) : undefined).filter(id => id != null);
     const params = {
       proteins: genesBackendIds,
       drugs: drugsBackendIds,
     };
-    console.log(params)
     return this.http.post<any>(`${environment.backend}adjacent_disorders/`, params);
   }
 
@@ -112,7 +111,7 @@ export class NetexControllerService {
      * Returns the expression in the given tissue for given nodes and cancerNodes
      */
       // slice prefix of netex id away for direct lookup in db, if node not mapped to db, replace by undefined
-    const genesBackendIds = nodes.map((node: Node) => node.netexId ? node.netexId.slice(1) : undefined).filter(id => id != null);
+    const genesBackendIds = nodes.map((node: Node) => node.netexId && node.netexId.startsWith('p') ? node.netexId.slice(1) : undefined).filter(id => id != null);
     const params = {
       pdi_dataset: pdiDataset,
       proteins: genesBackendIds