some improvements on create wroking report