diff --git a/components/configuration/VFBCircuitBrowser/datasources/SOLRclient.tsx b/components/configuration/VFBCircuitBrowser/datasources/SOLRclient.tsx
index 54afb424f..dbf04e499 100644
--- a/components/configuration/VFBCircuitBrowser/datasources/SOLRclient.tsx
+++ b/components/configuration/VFBCircuitBrowser/datasources/SOLRclient.tsx
@@ -197,7 +197,7 @@ function refineResults(e) {
 }
 
 export const datasourceConfiguration = {
-  "url": "https://solr.virtualflybrain.org/solr/ontology/select",
+  "url": "https://solr-dev.virtualflybrain.org/solr/ontology/select",
   "query_settings":
     {
       "q": "$SEARCH_TERM$ OR $SEARCH_TERM$* OR *$SEARCH_TERM$*",
diff --git a/components/interface/VFBCircuitBrowser/Controls.js b/components/interface/VFBCircuitBrowser/Controls.js
index 220e1de53..a6c6e1838 100644
--- a/components/interface/VFBCircuitBrowser/Controls.js
+++ b/components/interface/VFBCircuitBrowser/Controls.js
@@ -146,6 +146,7 @@ class AutocompleteResults extends Component {
     super(props);
     this.state = { filteredResults: {} };
     this.handleResults = this.handleResults.bind(this);
+    this.fieldLabel = this.props.field.label;
   }
   
   /**
@@ -153,20 +154,10 @@ class AutocompleteResults extends Component {
    */
   handleResults (status, data, value){
     let results = {};
-    console.log("Status ", status)
-    console.log("Data ", data)
-    console.log("Value ", value)
     data?.map(result => {
-      // Match results by short_form id
-      if ( result?.short_form?.toLowerCase().includes(value?.toLowerCase()) ){
-        results[result?.label] = result;
-      } else if ( result?.label?.toLowerCase().includes(value?.toLowerCase()) ){
-        results[result?.label] = result;
-      }
+      results[result?.label] = result;
     });
-    
-    console.log("Results ", results)
-      
+          
     this.setState({ filteredResults : results });
   }
   
@@ -174,9 +165,15 @@ class AutocompleteResults extends Component {
     return this.state.filteredResults;
   }
   
+  shouldComponentUpdate(nextProps, nextState) {
+    this.fieldLabel = nextProps.getLatestNeuronFields()[this.props.index].label;
+    return true;
+  }
+  
   render () {
     const label = "Neuron " + (this.props.index + 1) .toString();
-
+    const options = Object.keys(this.state.filteredResults).map(option => this.state.filteredResults[option].label);
+    
     return (
       <Autocomplete
         fullWidth
@@ -184,7 +181,7 @@ class AutocompleteResults extends Component {
         disableClearable
         disablePortal
         autoHighlight
-        value={this.props.field.label}
+        value={this.fieldLabel}
         id={this.props.index.toString()}
         ListboxProps={{ style: { maxHeight: "10rem" } }}
         onChange={this.props.resultSelectedChanged}
@@ -339,7 +336,6 @@ class Controls extends Component {
    * Neuron text field has been modified.
    */
   neuronTextfieldModified (event) {
-    console.log(event.key);
     this.resultsHeight = event.target.offsetTop + 15;
     // Remove old typing timeout interval
     if (this.state.typingTimeout) {
@@ -444,7 +440,7 @@ class Controls extends Component {
     const { classes } = this.props;
     this.circuitQuerySelected = this.props.circuitQuerySelected;
     let neuronFields = this.getUpdatedNeuronFields();
-
+    
     let expanded = this.state.expanded;
     if ( this.props.resultsAvailable() ){
       expanded = true;
@@ -503,6 +499,7 @@ class Controls extends Component {
                           field={field}
                           index={index}
                           neuronTextfieldModified={this.neuronTextfieldModified}
+                          getLatestNeuronFields={this.getUpdatedNeuronFields}
                           resultSelectedChanged={(event, value) => this.resultSelectedChanged(event, value, index)}
                           ref={this.autocompleteRef[index.toString()]}
                         />
diff --git a/components/interface/VFBCircuitBrowser/QueryParser.js b/components/interface/VFBCircuitBrowser/QueryParser.js
index fa9549181..6e2df5988 100644
--- a/components/interface/VFBCircuitBrowser/QueryParser.js
+++ b/components/interface/VFBCircuitBrowser/QueryParser.js
@@ -52,7 +52,9 @@ export function queryParser (e) {
       if (allRelationships.get(parseInt(startNode)) === undefined) {
         allRelationships.set(parseInt(startNode), new Array());
       }
-      allRelationships?.get(parseInt(startNode))?.push( { target : parseInt(endNode), label : properties[e.data.params.configuration.resultsMapping.link.label], weight : properties[e.data.params.configuration.resultsMapping.link.weight] });
+      if ( data[0]?.row[3].includes(parseInt(id)) ) {
+        allRelationships?.get(parseInt(startNode))?.push( { target : parseInt(endNode), label : properties[e.data.params.configuration.resultsMapping.link.label], weight : properties[e.data.params.configuration.resultsMapping.link.weight] });
+      }
     });
   });