Fixed some issue with jobs page