diff --git a/.env.development b/.env.development
deleted file mode 100644
index 9083b706..00000000
--- a/.env.development
+++ /dev/null
@@ -1,3 +0,0 @@
-NEXT_PUBLIC_API_PATH=/api/
-NEXT_PUBLIC_USE_PROXY=true
-NEXT_PUBLIC_SITE_URL=http://progenetix.test/
diff --git a/.env.local b/.env.local
deleted file mode 100644
index 31940342..00000000
--- a/.env.local
+++ /dev/null
@@ -1,5 +0,0 @@
-SERVER=http://progenetix.test/
-NEXT_PUBLIC_API_PATH=$SERVER
-NEXT_PUBLIC_PREFETCH_API_PATH=$SERVER
-NEXT_PUBLIC_USE_PROXY=false
-NEXT_PUBLIC_SITE_URL=$SERVER
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
deleted file mode 100644
index f9a3d1b9..00000000
--- a/.env.staging
+++ /dev/null
@@ -1,5 +0,0 @@
-SERVER=https://staging.progenetix.org/
-NEXT_PUBLIC_API_PATH=/
-NEXT_PUBLIC_PREFETCH_API_PATH=$SERVER
-NEXT_PUBLIC_USE_PROXY=false
-NEXT_PUBLIC_SITE_URL=$SERVER
\ No newline at end of file
diff --git a/env/local b/env/local
new file mode 100644
index 00000000..1c8c357b
--- /dev/null
+++ b/env/local
@@ -0,0 +1,5 @@
+SERVER=http://progenetix.test/
+NEXT_PUBLIC_API_PATH=http://progenetix.test/
+NEXT_PUBLIC_PREFETCH_API_PATH=http://progenetix.test/
+NEXT_PUBLIC_USE_PROXY=false
+NEXT_PUBLIC_SITE_URL=http://progenetix.test/
\ No newline at end of file
diff --git a/.env.production b/env/production
similarity index 100%
rename from .env.production
rename to env/production
diff --git a/env/staging b/env/staging
new file mode 100644
index 00000000..bddcabf7
--- /dev/null
+++ b/env/staging
@@ -0,0 +1,4 @@
+NEXT_PUBLIC_API_PATH=/
+NEXT_PUBLIC_PREFETCH_API_PATH=https://staging.progenetix.org/
+NEXT_PUBLIC_USE_PROXY=false
+NEXT_PUBLIC_SITE_URL=https://staging.progenetix.org/
\ No newline at end of file
diff --git a/package.json b/package.json
index 10147964..22e03b32 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "scripts": {
     "dev": "next",
     "build": "npm run lint && npm run test && next build && next export",
-    "update": "env-cmd -f .env.production npm run-script build",
-    "staging": "env-cmd -f .env.staging npm run-script build",
-    "local": "env-cmd -f .env.local npm run-script build",
+    "update": "env-cmd -f env/production npm run-script build",
+    "staging": "env-cmd -f env/staging npm run-script build",
+    "local": "env-cmd -f env/local npm run-script build",
     "start": "next start",
     "export": "next export",
     "test": "jest",
diff --git a/src/components/searchResults/DatasetResultBox.js b/src/components/searchResults/DatasetResultBox.js
index e8cafa50..62337058 100644
--- a/src/components/searchResults/DatasetResultBox.js
+++ b/src/components/searchResults/DatasetResultBox.js
@@ -14,6 +14,7 @@ import { ExternalLink } from "../helpersShared/linkHelpers"
 import { svgFetcher } from "../../hooks/fetcher"
 import BiosamplesStatsDataTable from "./BiosamplesStatsDataTable"
 import { WithData } from "../Loader"
+import { refseq2chro } from "../Chromosome"
 
 const HANDOVER_IDS = {
   histoplot: "histoplot",
@@ -380,8 +381,9 @@ function ucscHref(query) {
     ucscstart = query.start
     ucscend = query.start
   }
+  let chro = refseq2chro(query.referenceName)
 
-  return `http://www.genome.ucsc.edu/cgi-bin/hgTracks?db=hg38&position=chr${query.referenceName}%3A${ucscstart}%2D${ucscend}`
+  return `http://www.genome.ucsc.edu/cgi-bin/hgTracks?db=hg38&position=chr${chro}%3A${ucscstart}%2D${ucscend}`
 }
 
 function PagedLink({ handover }) {