diff --git a/slurm2sql.py b/slurm2sql.py
index 942850d..e1e68a3 100644
--- a/slurm2sql.py
+++ b/slurm2sql.py
@@ -938,14 +938,14 @@ def infer_type(cd):
                'JobIDnostep AS JobID, '
                'max(User) AS User, '
                'max(Partition) AS Partition, '
-               'max(JobName) AS JobName, '
+               '(SELECT s2.JobName FROM slurm AS s2 WHERE s2.JobIDnostep = slurm1.JobIDnostep AND s2.JobStep IS null LIMIT 1) AS JobName,'
                'group_concat(SubmitLine, \'\n\') AS SubmitLines, '
                'Account, '
                '(SELECT State FROM allocations AS allocations2 WHERE allocations2.jobid=slurm1.JobIDnostep) AS State, '
                #'State AS State, '
                'NodeList, '
                'Time, '
-               'TimeLimit, '
+               'max(TimeLimit) AS TimeLimit, '
                'min(Start) AS Start, '
                'max(End) AS End, '
                'max(NNodes) AS NNodes, '