REview working and nextjob query simplified