4 files changed, 22 insertions, 11 deletions
diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index 7ddd8cca..c94a7298 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -46,7 +46,7 @@ def container_lookup():
     if extid is None:
         return render_template('container_lookup.html')
     try:
-        resp = api.lookup_container(**{extid: request.args.get(extid)})
+        resp = api.lookup_container(**{extid: extid_value})
     except ValueError:
         return make_response(
             render_template('container_lookup.html',
@@ -178,7 +178,7 @@ def file_lookup():
     if extid is None:
         return render_template('file_lookup.html')
     try:
-        resp = api.lookup_file(**{extid: request.args.get(extid)})
+        resp = api.lookup_file(**{extid: extid_value})
     except ValueError:
         return make_response(
             render_template('file_lookup.html',
diff --git a/python/fatcat_web/templates/container_lookup.html b/python/fatcat_web/templates/container_lookup.html
index 1848739a..e6fb860c 100644
--- a/python/fatcat_web/templates/container_lookup.html
+++ b/python/fatcat_web/templates/container_lookup.html
@@ -18,7 +18,7 @@ Couldn't find a container with that identifier (<b><code>{{ lookup_key }}:{{
 lookup_value }}</code></b>). If you think it should be in the catalog, you could
 search for an existing record missing that identifier, or create a new container
 entity. 
-{% if lookup_key == "doi" %}
+{% if lookup_key == "issnl" %}
 <p>You can check if it is a registered ISSN-L by visiting:
 <b><a href="https://portal.issn.org/{{ lookup_value
 }}">https://portal.issn.org/{{ lookup_value }}</a></b>. If this is a valid
@@ -26,7 +26,7 @@ electronic or print ISSN, but not the ISSN-L for the container, you need to use
 the indicated "linking" ISSN.
 {% elif lookup_key == "wikidata_qid" %}
 <p>You can check if it is a real Wikidata entity by visiting:
-<b><a href="https://www.wikidata.org/wiki/{{ lookup_value }}/">https://www.wikidata.org/wiki/{{ lookup_value }}/</a></b>
+<b><a href="https://www.wikidata.org/wiki/{{ lookup_value }}">https://www.wikidata.org/wiki/{{ lookup_value }}</a></b>
 {% endif %}
 </div>
 {% endif %}
@@ -43,7 +43,7 @@ to the "print" ISSN number for a journal. Fatcat uses ISSN-L as the primary
 identifier for journals to reduce confusion and potential for duplication. The
 ISSN organization publicly publishes a mapping between linking and
 print/electronic ISSNs.
-{{ entity_macros.lookup_form("issnl", "1234-567X", lookup_key, lookup_value, lookup_error) }}
+{{ entity_macros.lookup_form("container", "issnl", "1234-567X", lookup_key, lookup_value, lookup_error) }}
 <i>&nbsp; Must include the dash</i>
 
 </div>
@@ -55,7 +55,7 @@ structured, machine-readable database that complements Wikipedia. Entities,
 which can include bibliographic entities like books and papers, are identified
 by a "QID". Fatcat also links container (journal) and creator (author) entities
 to Wikidata by QID. Anybody can edit Wikidata and create QIDs.
-{{ entity_macros.lookup_form("wikidata_qid", "Q94324", lookup_key, lookup_value, lookup_error) }}
+{{ entity_macros.lookup_form("container", "wikidata_qid", "Q94324", lookup_key, lookup_value, lookup_error) }}
 <i>&nbsp; Include the "Q" prefix.</i>
 
 </div>
diff --git a/python/fatcat_web/templates/creator_lookup.html b/python/fatcat_web/templates/creator_lookup.html
index 741efbda..b25c2a98 100644
--- a/python/fatcat_web/templates/creator_lookup.html
+++ b/python/fatcat_web/templates/creator_lookup.html
@@ -23,7 +23,7 @@ entity.
 <b><a href="https://orcid.org/{{ lookup_value }}">https://orcid.org/{{ lookup_value }}</a></b>
 {% elif lookup_key == "wikidata_qid" %}
 <p>You can check if it is a real Wikidata entity by visiting:
-<b><a href="https://www.wikidata.org/wiki/{{ lookup_value }}/">https://www.wikidata.org/wiki/{{ lookup_value }}/</a></b>
+<b><a href="https://www.wikidata.org/wiki/{{ lookup_value }}">https://www.wikidata.org/wiki/{{ lookup_value }}</a></b>
 {% endif %}
 </div>
 {% endif %}
diff --git a/python/fatcat_web/templates/release_lookup.html b/python/fatcat_web/templates/release_lookup.html
index 924d70db..add8da93 100644
--- a/python/fatcat_web/templates/release_lookup.html
+++ b/python/fatcat_web/templates/release_lookup.html
@@ -23,10 +23,21 @@ entity.
 <b><a href="https://doi.org/{{ lookup_value }}">https://doi.org/{{ lookup_value }}</a></b>
 {% elif lookup_key == "pmcid" %}
 <p>You can check if it is a real PMCID by visiting:
-<b><a href="https://www.ncbi.nlm.nih.gov/pmc/articles/{{ lookup_value }}/">https://www.ncbi.nlm.nih.gov/pmc/articles/{{ lookup_value }}/</a></b>
+<b><a href="https://www.ncbi.nlm.nih.gov/pmc/articles/{{ lookup_value }}">https://www.ncbi.nlm.nih.gov/pmc/articles/{{ lookup_value }}</a></b>
+{% elif lookup_key == "pmid" %}
+<p>You can check if it is a real PMID by visiting:
+<b><a href="https://www.ncbi.nlm.nih.gov/pubmed/{{ lookup_value }}">https://www.ncbi.nlm.nih.gov/pubmed/{{ lookup_value }}</a></b>
+{% elif lookup_key == "arxiv" %}
+<p>Note that Fatcat can only look up complete, versioned arxiv identifiers. If
+you don't know the version, you can append "v1" to get the first version.
+<p>You can check if it is a real arXiv pre-print by visiting:
+<b><a href="https://arxiv.org/abs/{{ lookup_value }}">https://arxiv.org/abs/{{ lookup_value }}</a></b>
+{% elif lookup_key == "jstor" %}
+<p>You can check if it is a real JSTOR work by visiting:
+<b><a href="https://www.jstor.org/stable/{{ lookup_value }}">https://www.jstor.org/stable/{{ lookup_value }}</a></b>
 {% elif lookup_key == "wikidata_qid" %}
 <p>You can check if it is a real Wikidata entity by visiting:
-<b><a href="https://www.wikidata.org/wiki/{{ lookup_value }}/">https://www.wikidata.org/wiki/{{ lookup_value }}/</a></b>
+<b><a href="https://www.wikidata.org/wiki/{{ lookup_value }}">https://www.wikidata.org/wiki/{{ lookup_value }}</a></b>
 {% endif %}
 </div>
 {% endif %}
@@ -83,8 +94,8 @@ to Wikidata by QID. Anybody can edit Wikidata and create QIDs.
 <p><a href="https://en.wikipedia.org/wiki/Archival_Resource_Key">Archival
 Resource Keys</a> are no-cost, distributed identifiers based on URLs. Mostly
 used by archival systems (as opposed to publishers or repositories).
-{{ entity_macros.lookup_form("release", "ark", "ark:2349/sddd92", lookup_key, lookup_value, lookup_error) }}
-<i>&nbsp; Only the identifier part (starting with "ark:"), not the full URL.</i>
+{{ entity_macros.lookup_form("release", "ark", "ark:/2349/sddd92", lookup_key, lookup_value, lookup_error) }}
+<i>&nbsp; Only the identifier part (starting with "ark:/"), not the full URL.</i>
 
 </div>
 <div class="ui attached segment">