Use Q.allSettled instead of .all
Rename shortId to number and add session field