Fix further bugs:
1) previous jobs
2) ms charge