diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c54716488..99591e561 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ name: CI
 # Controls when the action will run. Triggers the workflow on push only. ToDo: handle pull requests for testing only
 on:
   push:
-    branches: '*'
+    branches: '**'
     tags: 'v*'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -26,19 +26,20 @@ jobs:
       # Decide based on branch which servers to use
       - name: Pass branch
         id: branch
-        run: echo "::set-output name=value::${GITHUB_REF##*/}";
+        run: echo "::set-output name=value::${GITHUB_REF#refs/heads/}";
+            echo "::set-output name=clean::$(echo ${GITHUB_REF#refs/heads/} | sed 's@[/\\]@-@g')";
       - name: Setup local servers
         id: local-servers
         shell: bash
-        run: if [ "${GITHUB_REF##*/}" == master ] ; then
+        run: if [ "${GITHUB_REF#refs/heads/}" == master ] ; then
             echo "::debug::Set to master setup";
             echo "::set-output name=VFB_PDB_SERVER::http://pdb:7474";
             echo "::set-output name=VFB_OWL_SERVER::http://owl:8080/kbs/vfb/";
             echo "::set-output name=VFB_R_SERVER::http://ocpu:80/ocpu/library/vfbr/R/vfb_nblast";
-            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.virtualflybrain.org";
+            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.v4.virtualflybrain.org";
             echo "::set-output name=SOLR_SERVER::https://solr.virtualflybrain.org/solr/ontology/select";
             echo "::set-output name=BUILD_TYPE::release";
-          elif [ "${GITHUB_REF##*/}" == debug ] || [ "${GITHUB_REF##*/}" == pipeline2 ] || [ "${GITHUB_REF##*/}" == vfb_geppetto_application ] || [ "${GITHUB_REF##*/}" == development ] ; then
+          elif [ "${GITHUB_REF#refs/heads/}" == debug ] || [ "${GITHUB_REF#refs/heads/}" == pipeline2 ] || [ "${GITHUB_REF#refs/heads/}" == vfb_geppetto_application ] || [ "${GITHUB_REF#refs/heads/}" == development ] ; then
             echo "::debug::Set to dev setup";
             echo "::set-output name=VFB_PDB_SERVER::http://pdb:7474";
             echo "::set-output name=VFB_OWL_SERVER::http://owl:8080/kbs/vfb/";
@@ -46,7 +47,7 @@ jobs:
             echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb-dev.virtualflybrain.org";
             echo "::set-output name=SOLR_SERVER::https://solr-dev.virtualflybrain.org/solr/ontology/select";
             echo "::set-output name=BUILD_TYPE::development";
-          elif [ "${GITHUB_REF##*/}" == alpha ] ; then
+          elif [ "${GITHUB_REF#refs/heads/}" == alpha ] ; then
             echo "::debug::Set to alpha setup";
             echo "::set-output name=VFB_PDB_SERVER::http://pdb:7474";
             echo "::set-output name=VFB_OWL_SERVER::http://owl:8080/kbs/vfb/";
@@ -59,22 +60,22 @@ jobs:
             echo "::set-output name=VFB_PDB_SERVER::http://pdb:7474";
             echo "::set-output name=VFB_OWL_SERVER::http://owl:8080/kbs/vfb/";
             echo "::set-output name=VFB_R_SERVER::http://ocpu:80/ocpu/library/vfbr/R/vfb_nblast";
-            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.virtualflybrain.org";
+            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.v4.virtualflybrain.org";
             echo "::set-output name=SOLR_SERVER::https://solr.virtualflybrain.org/solr/ontology/select";
             echo "::set-output name=BUILD_TYPE::release";
           fi
       - name: Setup remote servers
         id: remote-servers
         shell: bash
-        run: if [ "${GITHUB_REF##*/}" == master ] ; then
+        run: if [ "${GITHUB_REF#refs/heads/}" == master ] ; then
             echo "::debug::Set to master setup";
-            echo "::set-output name=VFB_PDB_SERVER::http://pdb.virtualflybrain.org";
-            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.virtualflybrain.org";
+            echo "::set-output name=VFB_PDB_SERVER::http://pdb.v4.virtualflybrain.org";
+            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.v4.virtualflybrain.org";
             echo "::set-output name=VFB_OWL_SERVER::http://owl.virtualflybrain.org/kbs/vfb/";
             echo "::set-output name=VFB_R_SERVER::http://r.virtualflybrain.org/ocpu/library/vfbr/R/vfb_nblast";
             echo "::set-output name=SOLR_SERVER::https://solr.virtualflybrain.org/solr/ontology/select";
             echo "::set-output name=BUILD_TYPE::release";
-          elif [ "${GITHUB_REF##*/}" == debug ] || [ "${GITHUB_REF##*/}" == pipeline2 ] || [ "${GITHUB_REF##*/}" == vfb_geppetto_application ] || [ "${GITHUB_REF##*/}" == development ] ; then
+          elif [ "${GITHUB_REF#refs/heads/}" == debug ] || [ "${GITHUB_REF#refs/heads/}" == pipeline2 ] || [ "${GITHUB_REF#refs/heads/}" == vfb_geppetto_application ] || [ "${GITHUB_REF#refs/heads/}" == development ] ; then
             echo "::debug::Set to dev setup";
             echo "::set-output name=VFB_PDB_SERVER::http://pdb-dev.virtualflybrain.org";
             echo "::set-output name=VFB_OWL_SERVER::http://owl-dev.virtualflybrain.org/kbs/vfb/";
@@ -82,7 +83,7 @@ jobs:
             echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb-dev.virtualflybrain.org";
             echo "::set-output name=SOLR_SERVER::https://solr-dev.virtualflybrain.org/solr/ontology/select";
             echo "::set-output name=BUILD_TYPE::release";
-          elif [ "${GITHUB_REF##*/}" == alpha ] ; then
+          elif [ "${GITHUB_REF#refs/heads/}" == alpha ] ; then
             echo "::debug::Set to alpha setup";
             echo "::set-output name=VFB_PDB_SERVER::http://pdb-alpha.virtualflybrain.org";
             echo "::set-output name=VFB_OWL_SERVER::http://owl-alpha.virtualflybrain.org/kbs/vfb/";
@@ -92,14 +93,14 @@ jobs:
             echo "::set-output name=BUILD_TYPE::release";
           else 
             echo "::debug::Set to default setup";
-            echo "::set-output name=VFB_PDB_SERVER::http://pdb.virtualflybrain.org";
+            echo "::set-output name=VFB_PDB_SERVER::http://pdb.v4.virtualflybrain.org";
             echo "::set-output name=VFB_OWL_SERVER::http://owl.virtualflybrain.org/kbs/vfb/";
             echo "::set-output name=VFB_R_SERVER::http://r.virtualflybrain.org/ocpu/library/vfbr/R/vfb_nblast";
-            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.virtualflybrain.org";
+            echo "::set-output name=VFB_TREE_PDB_SERVER::https://pdb.v4.virtualflybrain.org";
             echo "::set-output name=SOLR_SERVER::https://solr.virtualflybrain.org/solr/ontology/select";
             echo "::set-output name=BUILD_TYPE::release";
           fi
-        
+      
       # Output the chosen servers
       - name: Used remote servers
         run: |
@@ -127,7 +128,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: "virtualflybrain/geppetto-vfb:${{ steps.branch.outputs.value }}-local.wss"
+          tags: "virtualflybrain/geppetto-vfb:${{ steps.branch.outputs.clean }}-local.wss"
           build-args: |
             VFB_TREE_PDB_SERVER_ARG=${{ steps.local-servers.outputs.VFB_TREE_PDB_SERVER }}
             SOLR_SERVER_ARG=${{ steps.local-servers.outputs.SOLR_SERVER }}
@@ -146,7 +147,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: "virtualflybrain/geppetto-vfb:${{ steps.branch.outputs.value }}-remote"
+          tags: "virtualflybrain/geppetto-vfb:${{ steps.branch.outputs.clean }}-remote"
           build-args: |
             VFB_TREE_PDB_SERVER_ARG=${{ steps.remote-servers.outputs.VFB_TREE_PDB_SERVER }}
             SOLR_SERVER_ARG=${{ steps.remote-servers.outputs.SOLR_SERVER }}
@@ -163,11 +164,14 @@ jobs:
         run: |
           echo "local:${{ steps.docker_build_local.outputs.digest }}"
           echo "remote:${{ steps.docker_build_remote.outputs.digest }}"
-                
+      
       - name: Install Puppeteer
         run: npm install jest@24.8.0 jest-image-snapshot@4.1.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5
       - name: Start VFB server
-        run: docker run -t -dit --name=testServer -p 8080:8080 "virtualflybrain/geppetto-vfb:${{ steps.branch.outputs.value }}-remote";
+        run: docker run -t -dit --name=testServer -p 8080:8080 "virtualflybrain/geppetto-vfb:${{ steps.branch.outputs.clean}}-remote";
+            sleep 100;
+            docker logs testServer;
+            if [ $(docker logs testServer | grep "fixable with the " | wc -l) -gt 0 ]; then echo "Lint Error!"; exit 1; fi;
       - name: Wait for VFB server to spin up
         run: |  
           export LANDING_PAGE="http://localhost:8080/org.geppetto.frontend/geppetto"  
@@ -182,7 +186,7 @@ jobs:
       - name: Test under review  
         continue-on-error: true
         run: |
-          if [ "${GITHUB_REF##*/}" == debug ] || [ "${GITHUB_REF##*/}" == pipeline2 ] || [ "${GITHUB_REF##*/}" == vfb_geppetto_application ] || [ "${GITHUB_REF##*/}" == development ] || [[ "${GITHUB_REF##*/}" =~ ^(fix|feature).* ]] ; then
+          if [ "${GITHUB_REF#refs/heads/}" == debug ] || [ "${GITHUB_REF#refs/heads/}" == pipeline2 ] || [ "${GITHUB_REF#refs/heads/}" == vfb_geppetto_application ] || [ "${GITHUB_REF#refs/heads/}" == development ] || [[ "${GITHUB_REF#refs/heads/}" =~ ^(fix|feature).* ]] ; then
             npm test -- --verbose --colors --forceExit --testPathPattern='geppetto-vfb/tests/jest/vfb/review/.*js';
           fi
       - name: Stop VFB server   
diff --git a/components/configuration/VFBCircuitBrowser/circuitBrowserConfiguration.js b/components/configuration/VFBCircuitBrowser/circuitBrowserConfiguration.js
index a5b1191ec..1b2ba5e29 100644
--- a/components/configuration/VFBCircuitBrowser/circuitBrowserConfiguration.js
+++ b/components/configuration/VFBCircuitBrowser/circuitBrowserConfiguration.js
@@ -6,20 +6,21 @@ var locationCypherQuery = ( instances, hops, weight ) => ({
       + " MATCH (source:has_neuron_connectivity {short_form: a}), (target:Neuron {short_form: b})"
       + " CALL gds.beta.shortestPath.yens.stream({"
       + "  nodeQuery: 'MATCH (n:has_neuron_connectivity) RETURN id(n) AS id',"
-      + "  relationshipQuery: 'MATCH (a:has_neuron_connectivity)-[r:synapsed_to]->(b:has_neuron_connectivity) WHERE exists(r.weight) AND r.weight[0] > "
+      + "  relationshipQuery: 'MATCH (a:has_neuron_connectivity)-[r:synapsed_to]->(b:has_neuron_connectivity) WHERE exists(r.weight) AND r.weight[0] >= "
       + weight.toString() + " RETURN id(a) AS source, id(b) AS target, type(r) as type, 5000-r.weight[0] as weight_p',"
       + "  sourceNode: id(source),"
       + "  targetNode: id(target),"
-      + "  k: " + hops.toString() + ","
+     + "  k: " + hops.toString() + ","
       + "  relationshipWeightProperty: 'weight_p',"
       + "  relationshipTypes: ['*'],"
       + "  path: true"
       + "})"
       + " YIELD index, sourceNode, targetNode, nodeIds, path"
-      + " OPTIONAL MATCH fp=(source)-[r:synapsed_to*..]->(target) WHERE ALL(n in nodes(fp) WHERE id(n) IN nodeIds)"
-      + " UNWIND r as sr WITH *, collect(id(sr)) as ids OPTIONAL MATCH cp=(source)-[r:synapsed_to*..]-(target)"
+      + " WITH * ORDER BY index DESC"
+     + " OPTIONAL MATCH fp=(source)-[r:synapsed_to*..]->(target) WHERE ALL(n in nodes(fp) WHERE id(n) IN nodeIds)"
+      + " UNWIND r as sr WITH *, collect(id(sr)) as ids, toString(id(sr))+':'+toString(index) as relY OPTIONAL MATCH cp=(source)-[r:synapsed_to*..]-(target)"
       + " WHERE ALL(n in nodes(cp) WHERE id(n) IN nodeIds) UNWIND ids as id"
-      + " RETURN distinct a as root, collect(distinct fp) as pp, collect(distinct cp) as p, collect(distinct id) as fr ",
+      + " RETURN distinct a as root, collect(distinct fp) as pp, collect(distinct cp) as p, collect(distinct id) as fr, sourceNode as source, targetNode as target, max(length(fp)) as maxHops, collect(distinct relY) as relationshipY ",
       "resultDataContents": ["row", "graph"]
     }
   ]
diff --git a/components/configuration/VFBGraph/graphConfiguration.js b/components/configuration/VFBGraph/graphConfiguration.js
index 05e067c20..75b854878 100644
--- a/components/configuration/VFBGraph/graphConfiguration.js
+++ b/components/configuration/VFBGraph/graphConfiguration.js
@@ -12,7 +12,7 @@ var locationCypherQuery = instance => ({
 var whatCypherQuery = instance => ({
   "statements": [
     {
-      "statement": "MATCH (n:Entity {short_form:'" + instance + "'}) OPTIONAL MATCH p=(n)-[:INSTANCEOF|:SUBCLASSOF*..]->(x) "
+      "statement": "MATCH (n:Entity {short_form:'" + instance + "'}) OPTIONAL MATCH p=(n)-[:INSTANCEOF|SUBCLASSOF*..]->(x) "
       + "WHERE ('Anatomy' IN  labels(x)) OR (('Cell' IN  labels(x)) OR ('synaptic neuropil' IN labels(x))) "
       + " OR (('Ganglion' IN  labels(x)) OR ('Neuron_projection_bundle' IN labels(x))) "
       + "RETURN  n,p, n.short_form as root",
@@ -84,7 +84,7 @@ var styling = {
 }
 
 var restPostConfig = {
-  url: "https://pdb.virtualflybrain.org/db/neo4j/tx/commit",
+  url: "https://pdb-dev.virtualflybrain.org/db/neo4j/tx/commit",
   contentType: "application/json"
 };
 
diff --git a/components/interface/VFBCircuitBrowser/Controls.js b/components/interface/VFBCircuitBrowser/Controls.js
index 7e2d6391d..6a212b5b1 100644
--- a/components/interface/VFBCircuitBrowser/Controls.js
+++ b/components/interface/VFBCircuitBrowser/Controls.js
@@ -122,6 +122,64 @@ const customMarks = () => {
   return marks;
 }
 
+class AutocompleteResults extends Component {
+  constructor (props) {
+    super(props);
+    this.state = { filteredResults: {} };
+    this.handleResults = this.handleResults.bind(this);
+  }
+  
+  /**
+   * Receives SOLR results and creates an map with those results that match the input text
+   */
+  handleResults (status, data, value){
+    let results = {};
+    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;
+      }
+    });
+      
+    this.setState({ filteredResults : results });
+  }
+  
+  getFilteredResults (){
+    return this.state.filteredResults;
+  }
+  
+  render () {
+    const label = "Neuron " + (this.props.index + 1) .toString();
+    return (
+      <Autocomplete
+        fullWidth
+        freeSolo
+        disableClearable
+        disablePortal
+        autoHighlight
+        value={this.props.field.label}
+        id={this.props.index.toString()}
+        ListboxProps={{ style: { maxHeight: "10rem" } }}
+        onChange={this.props.resultSelectedChanged}
+        options={Object.keys(this.state.filteredResults).map(option => this.state.filteredResults[option].label)}
+        renderInput={params => (
+          <TextField
+            {...params}
+            label={label}
+            key={this.props.field.id}
+            className={label.replace(/ +/g, "").toLowerCase()}
+            onChange={this.props.neuronTextfieldModified}
+            inputProps={{ ...params.inputProps, id: this.props.index, style: { color: "white" , paddingLeft : "10px" } }}
+            InputLabelProps={{ ...params.inputProps,style: { color: "white", paddingLeft : "10px" } }}
+          />
+        )}
+      />
+    )
+  }
+}
+
 /**
  * Controls component used in VFBCircuitBrowser.
  */
@@ -131,9 +189,7 @@ class Controls extends Component {
     super(props);
     this.state = {
       typingTimeout: 0,
-      expanded : true,
-      neuronFields : [{ id : "", label : "" } , { id : "", label : "" }],
-      filteredResults : {}
+      expanded : true
     };
     this.weight = this.props.weight;
     this.hops = this.props.hops;
@@ -145,14 +201,24 @@ class Controls extends Component {
     this.fieldsValidated = this.fieldsValidated.bind(this);
     this.deleteNeuronField = this.deleteNeuronField.bind(this);
     this.getUpdatedNeuronFields = this.getUpdatedNeuronFields.bind(this);
-    this.handleResults = this.handleResults.bind(this);
     this.resultSelectedChanged = this.resultSelectedChanged.bind(this);
     this.circuitQuerySelected = this.props.circuitQuerySelected;
+    this.autoCompleteInput = React.createRef();
+    this.neuronFields = [{ id : "", label : "" } , { id : "", label : "" }];
+    this.createRefs = this.createRefs.bind(this);
+    this.createRefs();
+  }
+  
+  createRefs () { 
+    this.autocompleteRef = {};
+    for ( var i = 0 ; i < configuration.minNeurons; i++ ){
+      this.autocompleteRef[i.toString()] = React.createRef();
+    }
   }
   
   componentDidMount () {
-    let neurons = [...this.props.neurons];
-    this.setState( { expanded : !this.props.resultsAvailable(), neuronFields : neurons } );
+    this.neuronFields = [...this.props.neurons];
+    this.setState( { expanded : !this.props.resultsAvailable() } );
     this.circuitQuerySelected = this.props.circuitQuerySelected;
     this.setInputValue = {};
   }
@@ -169,28 +235,26 @@ class Controls extends Component {
     }
     
     // remove neuron textfield
-    let neurons = this.state.neuronFields;
+    let neurons = this.neuronFields;
     neurons.splice(id,1);
-    
+    this?.props?.circuitQuerySelected?.splice(id, 1);
     this.props.vfbCircuitBrowser(UPDATE_CIRCUIT_QUERY, neurons);
-    
-    // Update state with one fewer neuron textfield
-    this.setState( { neuronFields : neurons } );
+    delete this.autocompleteRef[id.toString()];
+    this.neuronFields = neurons;
+    this.forceUpdate();
   }
   
   /**
    * Add neuron textfield
    */
   addNeuron () {
-    let neuronFields = this.state.neuronFields;
+    let neuronFields = this.neuronFields;
     // Add emptry string for now to text field
     neuronFields.push({ id : "", label : "" });
     // User has added the maximum number of neurons allowed in query search
-    if ( configuration.maxNeurons <= neuronFields.length ) {
-      this.setState({ neuronFields : neuronFields });
-    } else {
-      this.setState({ neuronFields : neuronFields });
-    }
+    this.neuronFields = neuronFields;
+    this.autocompleteRef[(neuronFields.length - 1).toString()] = React.createRef();
+    this.forceUpdate();
   }
 
   /**
@@ -209,48 +273,26 @@ class Controls extends Component {
     return true;
   }
   
-  /**
-   * Receives SOLR results and creates an map with those results that match the input text
-   */
-  handleResults (status, data, value) {
-    let results = {};
-    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;
-      }
-    });
-      
-    this.setState({ filteredResults : results })
-  }
-  
   /**
    * Waits some time before performing new search, this to avoid performing search everytime
    * enters a new character in neuron fields
    */
   typingTimeout (target) {
     this.setInputValue = target.id;
-    const match = this.state.neuronFields?.find(x => x.id === target.value || x.label === target.value );
-    let neurons = this.state.neuronFields;
-    if (!match) {
-      let index = neurons?.findIndex(x => x.id === "" );
-      if ( index >= 0) {
-        neurons[index] = { id : target.value, label : target.value };
-      } else {
-        if ( neurons[parseInt(target.id)] ) {
-          neurons[parseInt(target.id)] = { id : target.value, label : target.value };
-        } else {
-          neurons.push({ id : target.value, label : target.value });
-        }
-      }
-      
-      if ( this.fieldsValidated(neurons) ) {
-        this.setState( { neuronFields : neurons } );
-      }
+    if ( target.id === "" ) {
+      this.setInputValue = target.parentElement.id;
+    }
+    let neurons = this.neuronFields;
+
+    if ( neurons[parseInt(target.id)] ) {
+      neurons[parseInt(target.id)] = { id : target.value, label : target.value };
+    } else {
+      neurons.push({ id : target.value, label : target.value });
     }
-    getResultsSOLR( target.value, this.handleResults,searchConfiguration.sorter,datasourceConfiguration );
+      
+    // this.props.vfbCircuitBrowser(UPDATE_CIRCUIT_QUERY, neurons);
+    this.neuronFields = neurons;
+    getResultsSOLR( target.value, this.autocompleteRef[this.setInputValue].current.handleResults,searchConfiguration.sorter,datasourceConfiguration );
   }
   
   /**
@@ -271,17 +313,19 @@ class Controls extends Component {
    */
   resultSelectedChanged (event, value) {
     // Copy neurons and add selection to correct array index
-    let neurons = this.state.neuronFields;
-    neurons[this.setInputValue] = { id : this.state.filteredResults?.[value].short_form, label : value };
+    let neurons = this.neuronFields;
+    let textFieldId = event.target.id.toString().split("-")[0];
+    let shortForm = this.autocompleteRef[textFieldId].current.getFilteredResults()[value] && this.autocompleteRef[textFieldId].current.getFilteredResults()[value].short_form;
+    let index = neurons.findIndex(neuron => neuron.id === shortForm);
+    index > -1 ? neurons[index] = { id : shortForm, label : value } : null
     
     // Keep track of query selected, and send an event to redux store that circuit has been updated
     this.circuitQuerySelected = neurons;
     this.props.vfbCircuitBrowser(UPDATE_CIRCUIT_QUERY, neurons);
-    this.setState({ filteredResults : {} })
 
     // If text fields contain valid ids, perform query
     if ( this.fieldsValidated(neurons) ) {
-      this.setState( { neuronFields : neurons } );
+      this.neuronFields = neurons;
     }
   }
   
@@ -300,10 +344,10 @@ class Controls extends Component {
    * Update neuron fields if there's a query preselected.
    */
   getUpdatedNeuronFields () {
-    let neuronFields = this.state.neuronFields;
+    let neuronFields = this.neuronFields;
     let added = false;
     for ( var i = 0; i < this.props.circuitQuerySelected.length; i++ ){
-      var fieldExists = this.state.neuronFields.find(entry =>
+      var fieldExists = this.neuronFields.find(entry =>
         entry.id === this.props.circuitQuerySelected[i] || entry.id === this.props.circuitQuerySelected?.[i]?.id
       );
 
@@ -332,8 +376,8 @@ class Controls extends Component {
     let self = this;
     const { classes } = this.props;
     this.circuitQuerySelected = this.props.circuitQuerySelected;
-    let neuronFields = this.getUpdatedNeuronFields()
-    
+    let neuronFields = this.getUpdatedNeuronFields();
+
     let expanded = this.state.expanded;
     if ( this.props.resultsAvailable() ){
       expanded = true;
@@ -355,7 +399,7 @@ class Controls extends Component {
             <i style={ { zIndex : "1000" , cursor : "pointer", marginTop : "5px", left : "10px" } } className={stylingConfiguration.controlIcons.zoomOut} onClick={self.props.zoomOut }></i>
           </div>
           { this.props.resultsAvailable()
-            ? <ul className={classes.legend}>
+            ? <ul className={classes.legend} id="circuitBrowserLegend">
               { this.props.legend.map((label, index) => (
                 <li><div className={classes.legendItem} style={{ backgroundColor : stylingConfiguration.nodeColorsByLabel[label] }}></div>{label}</li> 
               ))
@@ -383,31 +427,16 @@ class Controls extends Component {
                     <RoomIcon />
                   </div>
                 </Grid>
-                <Grid item sm={11}>
-                  { neuronFields.map((field, index) => {
-                    let label = "Neuron " + (index + 1) .toString();
-                    return <Grid container alignItems="center" justify="center" key={"TextFieldContainer" + index}>
+                <Grid id="neuronFieldsGrid" item sm={11}>
+                  { neuronFields.map((field, index) => (
+                    <Grid container alignItems="center" justify="center" key={"TextFieldContainer" + index}>
                       <Grid item sm={neuronColumnSize} key={"TextFieldItem" + index}>
-                        <Autocomplete
-                          freeSolo
-                          fullWidth
-                          disableClearable
-                          autoHighlight
-                          value={field.label}
-                          id={index.toString()}
-                          onChange={this.resultSelectedChanged}
-                          options={Object.keys(this.state.filteredResults).map(option => this.state.filteredResults[option].label)}
-                          renderInput={params => (
-                            <TextField
-                              {...params}
-                              label={"Neuron " + ( index + 1 ).toString()}
-                              key={field.id}
-                              id={index}
-                              onChange={this.neuronTextfieldModified}
-                              inputProps={{ ...params.inputProps, style: { color: "white" , paddingLeft : "10px" } }}
-                              InputLabelProps={{ ...params.inputProps,style: { color: "white", paddingLeft : "10px" } }}
-                            />
-                          )}
+                        <AutocompleteResults
+                          field={field}
+                          index={index}
+                          neuronTextfieldModified={this.neuronTextfieldModified}
+                          resultSelectedChanged={this.resultSelectedChanged}
+                          ref={this.autocompleteRef[index.toString()]}
                         />
                       </Grid>
                       { deleteIconVisible ? <Grid item sm={1}>
@@ -415,6 +444,7 @@ class Controls extends Component {
                           key={"TextFieldIcon-" + index}
                           onClick={self.deleteNeuronField}
                           fontSize="small"
+                          id={"deleteNeuron" + ( index ).toString()}
                           classes = {{ root : classes.deleteNeuron }}>
                           <DeleteIcon id={index.toString()}/>
                         </IconButton>
@@ -422,12 +452,13 @@ class Controls extends Component {
                         : null
                       }
                     </Grid>
-                  })}
+                  ))}
                 </Grid>
                 <Grid item sm={12}>
                   { addNeuronDisabled 
                     ? null
                     : <Button
+                      id="addNeuron"
                       color="inherit"
                       classes={{ root : classes.addNeuron }}
                       size="small"
@@ -465,14 +496,15 @@ class Controls extends Component {
                     <Typography>Weight</Typography>
                   </Grid>
                   <Grid item sm={4}>
-                    <Input label="Graph weight" defaultValue={this.weight} onChange={this.weightChange} inputProps={{ 'aria-label': 'description', className : classes.weightInput }} />
+                    <Input label="Graph weight" defaultValue={this.weight} onChange={this.weightChange} inputProps={{ 'aria-label': 'description', id : "weightField", className : classes.weightInput }} />
                   </Grid>
                   <Grid item container justify="flex-end" sm={6}>
                     <Button
                       color="primary"
                       variant="contained"
                       size="small"
-                      onClick={() => this.props.updateGraph(this.state.neuronFields, this.hops, this.weight)}
+                      id="refreshCircuitBrowser"
+                      onClick={() => this.props.updateGraph(this.neuronFields, this.hops, this.weight)}
                     >Refresh Graph</Button>  
                   </Grid>
                 </Grid>
diff --git a/components/interface/VFBCircuitBrowser/VFBCircuitBrowser.js b/components/interface/VFBCircuitBrowser/VFBCircuitBrowser.js
index d04e0cbce..ff59f498b 100644
--- a/components/interface/VFBCircuitBrowser/VFBCircuitBrowser.js
+++ b/components/interface/VFBCircuitBrowser/VFBCircuitBrowser.js
@@ -398,11 +398,6 @@ class VFBCircuitBrowser extends Component {
 
               const start = link.source;
               const end = link.target;
-
-              if ( start.y < end.y && !link.modified ) {
-                link.curvature = -1 * link.curvature;
-                link.modified = true;
-              }
               
               // ignore unbound links
               if (typeof start !== 'object' || typeof end !== 'object') {
diff --git a/components/interface/VFBGraph/VFBGraph.js b/components/interface/VFBGraph/VFBGraph.js
index cea955498..3d539cc85 100644
--- a/components/interface/VFBGraph/VFBGraph.js
+++ b/components/interface/VFBGraph/VFBGraph.js
@@ -460,7 +460,10 @@ class VFBGraph extends Component {
   getErrorLabel () {
     let self = this;
     if ( this.selectedDropDownQuery == -1 ) {
-      return this.querySelection.label(self.state.currentQuery.id);
+      if ( this.querySelection?.label ){
+        return this.querySelection?.label(self.state.currentQuery.id);
+      }
+      return null;
     }
     return stylingConfiguration.dropDownQueries.map((item, index) => {
       if ( self.selectedDropDownQuery === index ) {
diff --git a/tests/jest/vfb/review/circuit-browser-tests.js b/tests/jest/vfb/review/circuit-browser-tests.js
index 401fb7ff0..e4fb4ad40 100644
--- a/tests/jest/vfb/review/circuit-browser-tests.js
+++ b/tests/jest/vfb/review/circuit-browser-tests.js
@@ -2,12 +2,14 @@ const puppeteer = require('puppeteer');
 const { TimeoutError } = require('puppeteer/Errors');
 
 import { getCommandLineArg, getUrlFromProjectId } from '../cmdline.js';
-import { wait4selector, click, testLandingPage, flexWindowClick, findElementByText, selectTab } from '../utils';
+import { wait4selector, click, testLandingPage, flexWindowClick, findElementByText, selectTab, setTextFieldValue } from '../utils';
 import * as ST from '../selectors';
 
 const baseURL = process.env.url ||  'http://localhost:8080/org.geppetto.frontend';
 const projectURL = baseURL + "/geppetto";
 
+const ONE_SECOND = 1000;
+
 /**
  * TODO: Work in progress, need to expand, right now only tests Circuit Browser opens
  * Tests Circuit Browser Component
@@ -15,7 +17,7 @@ const projectURL = baseURL + "/geppetto";
 describe('VFB Circuit Browser Tests', () => {
 	beforeAll(async () => {
 		//increases timeout to ~8 minutes
-		jest.setTimeout(500000);
+		jest.setTimeout(60 * ONE_SECOND);
 		await page.goto(projectURL);
 
 	});
@@ -31,7 +33,60 @@ describe('VFB Circuit Browser Tests', () => {
 			await selectTab(page, "Circuit Browser");
 
 			// Check that the Tree Browser is visible
-			await wait4selector(page, 'div#VFBCircuitBrowser', { visible: true, timeout : 800000 });
+			await wait4selector(page, 'div#VFBCircuitBrowser', { visible: true, timeout : 90 * ONE_SECOND });
+		})
+		
+		it('Set Neuron 1 , VFB_jrchjrch', async () => {
+			await page.waitFor(5 * ONE_SECOND);
+			await setTextFieldValue(".neuron1 input", "VFB_jrchjrch")
+			
+			await wait4selector(page, 'ul.MuiAutocomplete-listbox', { visible: true, timeout : 90 * ONE_SECOND });
+
+   		    await page.click('ul.MuiAutocomplete-listbox li');
+		})
+		
+		it('Set Neuron 2, VFB_jrchjsfu', async () => {
+			await page.waitFor(ONE_SECOND);
+			await setTextFieldValue(".neuron2 input", "VFB_jrchjsfu")
+
+			await wait4selector(page, 'ul.MuiAutocomplete-listbox', { visible: true, timeout : 90 * ONE_SECOND });
+			
+  		    await page.click('ul.MuiAutocomplete-listbox li');
+		})
+		
+		it('Refresh Graph with VFB_jrchjrch and VFB_jrchjsfu', async () => {
+  		    await page.waitFor(ONE_SECOND);
+   		    await page.click('#refreshCircuitBrowser');
+			await wait4selector(page, '#circuitBrowserLegend', { visible: true, timeout : 90 * ONE_SECOND });
+			
+			const legendLabels =  await page.evaluate( () => document.querySelectorAll("#circuitBrowserLegend li").length)
+		    expect(legendLabels).toBe(2);
+		})
+		
+		it('Set weight field to 20', async () => {
+			await page.waitFor(5 * ONE_SECOND);
+			await setTextFieldValue("#weightField", 20)
+			await page.waitFor(ONE_SECOND);
+			
+   		    await page.click('#refreshCircuitBrowser');
+			await page.waitFor(10 * ONE_SECOND);
+			await wait4selector(page, '#circuitBrowserLegend', { visible: true, timeout : 90 * ONE_SECOND });
+			
+			const legendLabels =  await page.evaluate( () => document.querySelectorAll("#circuitBrowserLegend li").length)
+		    expect(legendLabels).toBe(3);
+		})
+
+		it('Set weight field to 50', async () => {
+			await page.waitFor(ONE_SECOND);
+			await setTextFieldValue("#weightField", 50)
+			await page.waitFor(ONE_SECOND);
+			
+   		    await page.click('#refreshCircuitBrowser');
+			await page.waitFor(10 * ONE_SECOND);
+			await wait4selector(page, '#circuitBrowserLegend', { visible: true, timeout : 90 * ONE_SECOND });
+			
+			const legendLabels =  await page.evaluate( () => document.querySelectorAll("#circuitBrowserLegend li").length)
+		    expect(legendLabels).toBe(2);
 		})
 	})
 })
diff --git a/tests/jest/vfb/review/term-context-tests.js b/tests/jest/vfb/review/term-context-tests.js
index 47937696c..c1bd76d25 100644
--- a/tests/jest/vfb/review/term-context-tests.js
+++ b/tests/jest/vfb/review/term-context-tests.js
@@ -104,6 +104,8 @@ describe('VFB Term Context Component Tests', () => {
 		it("Snapshot Comparison of Term Context After Medulla Loaded, Graph Remains the Same", async () => {
 			// Wait 5 seconds so nodes in Term Context stop moving
 			await page.waitFor(5000);
+			await click(page, 'i.fa-home');
+			await page.waitFor(2000);
 			const image = await page.screenshot();
 			// This will fail if Adult Brain is not still loaded.
 			expect(image).toMatchImageSnapshot( { ...SNAPSHOT_OPTIONS, customSnapshotsDir : "./tests/jest/vfb/snapshots/term-context/adult-brain"  });
@@ -112,8 +114,12 @@ describe('VFB Term Context Component Tests', () => {
 		it('Snapshot Comparison of Term Context After Sync Trigger, Graph Displays Medulla', async () => {
 			// Click on sync button
 			await click(page, 'i.fa-refresh');
+			await page.waitFor(2000)
 			// Wait 10 seconds so nodes in Term Context stop moving
 			await page.waitFor(10000);
+			// reset camera to center, to make snapshots for tests be taken when camera is centered
+			await click(page, 'i.fa-home');
+			await page.waitFor(2000);
 			// Take screenshot, and compared to stored image of page.
 			const image = await page.screenshot();
 			// This will fail if Medulla didn't load in Term Context, since snapshot comparison will show differences
diff --git a/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-medulla-loaded-graph-remains-the-same-1-snap.png b/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-medulla-loaded-graph-remains-the-same-1-snap.png
index 71e07d0dc..cab033cce 100644
Binary files a/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-medulla-loaded-graph-remains-the-same-1-snap.png and b/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-medulla-loaded-graph-remains-the-same-1-snap.png differ
diff --git a/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-test-term-context-component-snapshot-comparison-of-term-context-1-snap.png b/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-test-term-context-component-snapshot-comparison-of-term-context-1-snap.png
index 3c3fcb73f..682c069a8 100644
Binary files a/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-test-term-context-component-snapshot-comparison-of-term-context-1-snap.png and b/tests/jest/vfb/snapshots/term-context/adult-brain/term-context-tests-js-vfb-term-context-component-tests-test-term-context-component-snapshot-comparison-of-term-context-1-snap.png differ
diff --git a/tests/jest/vfb/snapshots/term-context/medulla/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-sync-trigger-graph-displays-medulla-1-snap.png b/tests/jest/vfb/snapshots/term-context/medulla/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-sync-trigger-graph-displays-medulla-1-snap.png
index fd9941e34..4d998c3c1 100644
Binary files a/tests/jest/vfb/snapshots/term-context/medulla/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-sync-trigger-graph-displays-medulla-1-snap.png and b/tests/jest/vfb/snapshots/term-context/medulla/term-context-tests-js-vfb-term-context-component-tests-add-medulla-snapshot-comparison-of-term-context-after-sync-trigger-graph-displays-medulla-1-snap.png differ
diff --git a/tests/jest/vfb/utils.js b/tests/jest/vfb/utils.js
index 761a5861f..ade88dfb0 100644
--- a/tests/jest/vfb/utils.js
+++ b/tests/jest/vfb/utils.js
@@ -105,6 +105,22 @@ export const closeModalWindow = async (page) => {
 	});
 }
 
+export const setTextFieldValue = async(selector, value) => {
+  await page.evaluate( (selector, value) =>
+    {
+      var element = document.querySelector(selector);
+      let lastValue = element.value;
+      element.value = value;
+      let event = new Event('input', { bubbles: true });
+      event.simulated = true;
+      let tracker = element._valueTracker;
+      if (tracker) {
+        tracker.setValue(lastValue);
+      }
+      element.dispatchEvent(event);
+    }, selector, value)
+}
+
 export const flexWindowClick = async (title, selector) => {
 	await page.evaluate((title, selector) => {
 		if (document.getElementsByClassName("flexlayout__tab_button_content")  != undefined && document.getElementsByClassName("flexlayout__tab_button_content").length != undefined && document.getElementsByClassName("flexlayout__tab_button_content").length > 0) {