diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py
index 05fc224f..ee26aca6 100644
--- a/rowers/dataprepnodjango.py
+++ b/rowers/dataprepnodjango.py
@@ -1219,10 +1219,45 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
 
     data = data.replace([-np.inf,np.inf],np.nan)
     data = data.fillna(method='ffill')
-
+    
     # write data if id given
     if id != 0:
         data['workoutid'] = id
+
+        data = data[['averageforce',
+                     'cumdist',
+                     'distance',
+                     'distanceperstroke',
+                     'driveenergy',
+                     'drivelength',
+                     'drivespeed',
+                     'forceratio',
+                     'fpace',
+                     'ftime',
+                     'hr',
+                     'pace',
+                     'peakforce',
+                     'power',
+                     'spm',
+                     'time',
+                     'velo',
+                     'workoutstate',
+                     'x_right',
+                     'wash',
+                     'catch',
+                     'slip',
+                     'finish',
+                     'peakforceangle',
+                     'totalangle',
+                     'effectiveangle',
+                     'efficiency',
+                     'ergpace',
+                     'nowindpace',
+                     'equivergpower',
+                     'fergpace',
+                     'fnowindpace',
+                     'workoutid']]
+        
         if debug:
             engine = create_engine(database_url_debug, echo=False)
         else:
diff --git a/rowers/utils.py b/rowers/utils.py
index d88b07f4..0b3fef25 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -286,6 +286,7 @@ def myqueue(queue,function,*args,**kwargs):
         job_id = str(uuid.uuid4())
         kwargs['job_id'] = job_id
         kwargs['jobkey'] = job_id
+        kwargs['timeout'] = 3600
 
         job = queue.enqueue(function,*args,**kwargs)