diff --git a/SearchAPI/CMR/Output/geojson.py b/SearchAPI/CMR/Output/geojson.py
index 8178162f..981b572c 100644
--- a/SearchAPI/CMR/Output/geojson.py
+++ b/SearchAPI/CMR/Output/geojson.py
@@ -58,13 +58,19 @@ def getItem(self, p):
         except TypeError:
             pass
 
+        if p.get('absoluteOrbit') is not None and len(p.get('absoluteOrbit')):
+            p['absoluteOrbit'] = p['absoluteOrbit'][0]
+        
+        coordinates = []
+        
+        if p.get('shape') is not None:
+            coordinates = [[float(c['lon']), float(c['lat'])] for c in p.get('shape')]
+        
         result = {
             'type': 'Feature',
             'geometry': {
                 'type': 'Polygon',
-                'coordinates': [
-                    [[float(c['lon']), float(c['lat'])] for c in p['shape']]
-                ]
+                'coordinates': coordinates
             },
             'properties': {
                 'beamModeType': p['beamModeType'],
@@ -82,7 +88,7 @@ def getItem(self, p):
                 'insarStackId': p['insarGrouping'],
                 'md5sum': p['md5sum'],
                 'offNadirAngle': p['offNadirAngle'],
-                'orbit': p['absoluteOrbit'][0],
+                'orbit': p['absoluteOrbit'],
                 'pathNumber': p['relativeOrbit'],
                 'platform': p['platform'],
                 'pointingAngle': p['pointingAngle'],
diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py
index 1ac0a4e7..00087a00 100644
--- a/SearchAPI/CMR/SubQuery.py
+++ b/SearchAPI/CMR/SubQuery.py
@@ -25,6 +25,9 @@ def __init__(self, req_fields, params, extra_params):
         self.headers = {}
         
         token = request.args.get("cmr_token")
+        if token is None:
+            token = request.form.get('cmr_token')
+        
         if token != None:
             self.headers['Authorization'] = f'Bearer {token}'
 
diff --git a/SearchAPI/CMR/Translate/input_map.py b/SearchAPI/CMR/Translate/input_map.py
index b3bdfd90..fc879799 100644
--- a/SearchAPI/CMR/Translate/input_map.py
+++ b/SearchAPI/CMR/Translate/input_map.py
@@ -57,7 +57,8 @@ def input_map():
         'absoluteburstid':      ['attribute[]',             'int,BURST_ID_ABSOLUTE,{0}',        parse_int_list],
         'fullburstid':          ['attribute[]',             'string,BURST_ID_FULL,{0}',         parse_string_list],
         'operaburstid':         ['attribute[]',             'string,OPERA_BURST_ID,{0}',        parse_string_list],
-        'dataset':              [None,                      '{0}',                              parse_string_list]
+        'dataset':              [None,                      '{0}',                              parse_string_list],
+        'shortname':            ['shortName',                      '{0}',                       parse_string_list]
     }
 
     return parameter_map