diff --git a/cogs/economy.py b/cogs/economy.py
index 8252b33..6d10dcc 100644
--- a/cogs/economy.py
+++ b/cogs/economy.py
@@ -670,6 +670,7 @@ class Economy(commands.Cog):
         for pack in p_query['packs']:
             p_group = None
             logging.debug(f'pack: {pack}')
+            logging.info(f'pack cardset: {pack["pack_cardset"]}')
             if pack['pack_team'] is None and pack['pack_cardset'] is None:
                 if pack['pack_type']['name'] in p_data:
                     p_group = pack['pack_type']['name']
@@ -684,6 +685,9 @@ class Economy(commands.Cog):
                 elif pack['pack_type']['name'] == 'MVP':
                     p_group = f'MVP-Team-{pack["pack_team"]["id"]}-{pack["pack_team"]["sname"]}'
 
+                if pack['pack_cardset'] is not None:
+                    p_group += f'-Cardset-{pack["pack_cardset"]["id"]}'
+
             elif pack['pack_cardset'] is not None:
                 if pack['pack_type']['name'] == 'Standard':
                     p_group = f'Standard-Cardset-{pack["pack_cardset"]["id"]}-{pack["pack_cardset"]["name"]}'
diff --git a/db_calls.py b/db_calls.py
index a4ef5fa..500f12b 100644
--- a/db_calls.py
+++ b/db_calls.py
@@ -7,14 +7,11 @@ import aiohttp
 import os
 
 AUTH_TOKEN = {'Authorization': f'Bearer {os.environ.get("API_TOKEN")}'}
-DB_URL = 'https://pd.manticorum.com/api'
+ENV_DATABASE = os.environ.get('DATABASE').lower()
+DB_URL = 'https://pd.manticorum.com/api' if 'prod' in ENV_DATABASE else 'https://pddev.manticorum.com/api'
 master_debug = True
-alt_database = False
 PLAYER_CACHE = {}
 
-if alt_database == 'dev':
-    DB_URL = 'https://pddev.manticorum.com/api'
-
 
 def param_char(other_params):
     if other_params:
diff --git a/helpers.py b/helpers.py
index beba1c7..007ce1c 100644
--- a/helpers.py
+++ b/helpers.py
@@ -635,7 +635,10 @@ class SelectOpenPack(discord.ui.Select):
 
         cardset_id = None
         if 'Team Choice' in pack_vals and 'Cardset' in pack_vals:
-            cardset_id = pack_vals[2]
+            # cardset_id = pack_vals[2]
+            cardset_index = pack_vals.index('Cardset')
+            cardset_id = pack_vals[cardset_index + 1]
+            params.append(('pack_cardset_id', cardset_id))
             if 'Team' not in pack_vals:
                 view = SelectView(
                     [SelectChoicePackTeam('AL', self.owner_team, cardset_id),
@@ -647,11 +650,14 @@ class SelectOpenPack(discord.ui.Select):
                     view=view
                 )
                 return
-        elif 'Team' in pack_vals:
-            params.append(('pack_team_id', pack_vals[2]))
-        elif 'Cardset' in pack_vals:
-            params.append(('pack_cardset_id', pack_vals[2]))
-            cardset_id = pack_vals[2]
+            
+            params.append(('pack_team_id', pack_vals[pack_vals.index('Team') + 1]))
+        else:
+            if 'Team' in pack_vals:
+                params.append(('pack_team_id', pack_vals[pack_vals.index('Team') + 1]))
+            if 'Cardset' in pack_vals:
+                cardset_id = pack_vals[pack_vals.index('Cardset') + 1]
+                params.append(('pack_cardset_id', cardset_id))
 
         p_query = await db_get('packs', params=params)
         if p_query['count'] == 0: