Added workitem admin
Less LOC in generate_results()