diff --git a/SearchAPI/CMR/Translate/parse_cmr_response.py b/SearchAPI/CMR/Translate/parse_cmr_response.py
index a321597a..57f7ccb4 100644
--- a/SearchAPI/CMR/Translate/parse_cmr_response.py
+++ b/SearchAPI/CMR/Translate/parse_cmr_response.py
@@ -66,6 +66,8 @@ def remove_field(f):
             platform = get_val('./Platforms/Platform/ShortName')
         result['platform'] = platform
         remove_field('platform')
+        if result['platform'] in ['ALOS-2']:
+            result['beamMode'] = get_val(attr_path('BEAM_MODE'))
 
     if 'frameNumber' in req_fields:
         asf_frame_platforms = [
@@ -204,8 +206,7 @@ def float_or_none(a):
         if len(urls):
             result['downloadUrl'] = urls[0]
             result['fileName'] = result['granuleName'] + '.' + urls[0].split('.')[-1]
-    if result['platform'] in ['ALOS-2']:
-        result['beamMode'] = get_val(attr_path('BEAM_MODE'))
+
 
     def get_all_urls():
         accessPath = './OnlineAccessURLs/OnlineAccessURL/URL'