Stack frames out of order

Fixed now, unfortunately had to make another query as sequelize doesn't
seem to support ordering on eager loaded things?