WF-1622 - fixed checklist errors and query correction