Sorting fix
DelayedJob support