EPE-27-29_ReworkWUList

Fixes EPE-27
Fixes EPE-29

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>